Added CORS support

Conflicts: app/AppKernel.php app/config/config.yml composer.json composer.lock
PROCERGS · Nov 5, 2015 · 3807423 · 3807423
1 parent 9910837
commit 3807423
Show file tree

Hide file tree

Showing 4 changed files with 131 additions and 5 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -53,6 +53,8 @@ public function registerBundles()
 
             new OAuth2\ServerBundle\OAuth2ServerBundle(),
             new LoginCidadao\OpenIDBundle\LoginCidadaoOpenIDBundle(),
+
+            new Nelmio\CorsBundle\NelmioCorsBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -131,6 +131,12 @@ doctrine:
             countif: PROCERGS\LoginCidadao\CoreBundle\DQL\CountIf
             lowerunaccent: PROCERGS\LoginCidadao\CoreBundle\DQL\LowerUnaccent
 
+          datetime_functions:
+                date:       Oro\ORM\Query\AST\Functions\SimpleFunction
+
+          numeric_functions:
+              dayofweek:    Oro\ORM\Query\AST\Functions\SimpleFunction
+
 # Swiftmailer Configuration
 swiftmailer:
     transport: %mailer_transport%
@@ -380,3 +386,10 @@ scheb_two_factor:
     security_tokens:
         - Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken
         - FOS\FacebookBundle\Security\Authentication\Token\FacebookUserToken
+
+nelmio_cors:
+    paths:
+        '^/api/':
+            allow_origin: ['*']
+            allow_headers: ['*']
+            allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
diff --git a/composer.json b/composer.json
@@ -51,7 +51,9 @@
         "bshaffer/oauth2-server-bundle": "dev-develop",
         "phpseclib/phpseclib": "2.0.0",
         "gree/jose": "^2.0",
-        "league/uri": "^4.0"
+        "league/uri": "^4.0",
+        "oro/doctrine-extensions": "^1.0",
+        "nelmio/cors-bundle": "^1.4"
     },
     "require-dev": {
         "sensio/generator-bundle" : "~2.3"

diff --git a/composer.lock b/composer.lock