Merge remote-tracking branch 'upstream/3.2' into 2.0-rc

Conflicts: LICENSE app/config/config.yml composer.json composer.lock
symfony-cmf · Feb 1, 2017 · 631b917 · 631b917
2 parents 1d6b05b + d68e2e0
commit 631b917
Show file tree

Hide file tree

Showing 8 changed files with 342 additions and 843 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Symfony CMF
+Copyright (c) 2004-2017 Symfony CMF
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -10,7 +10,6 @@ public function registerBundles()
         $bundles = [
             // Symfony Standard Edition Bundles
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
             new Symfony\Bundle\TwigBundle\TwigBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
@@ -32,9 +31,6 @@ public function registerBundles()
             new Symfony\Cmf\Bundle\MenuBundle\CmfMenuBundle(),
             new Knp\Bundle\MenuBundle\KnpMenuBundle(),
 
-            new Symfony\Cmf\Bundle\CreateBundle\CmfCreateBundle(),
-            new FOS\RestBundle\FOSRestBundle(),
-
             // Application bundles
             new AppBundle\AppBundle(),
         ];

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -41,19 +41,6 @@ twig:
     debug:            '%kernel.debug%'
     strict_variables: '%kernel.debug%'
 
-# Assetic Configuration
-assetic:
-    debug:          '%kernel.debug%'
-    use_controller: false
-    bundles:        [CmfCreateBundle]
-    #java: /usr/bin/java
-    filters:
-        cssrewrite: ~
-        #closure:
-        #    jar: '%kernel.root_dir%/Resources/java/compiler.jar'
-        #yui_css:
-        #    jar: '%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar'
-
 # Doctrine Configuration (needed for Jackalope Doctrine DBAL)
 doctrine:
     dbal:

diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
@@ -30,8 +30,5 @@ monolog:
         #    type:   chromephp
         #    level:  info
 
-assetic:
-    use_controller: '%use_assetic_controller%'
-
 #swiftmailer:
-#    delivery_address: [email protected]
+#    delivery_addresses: ['[email protected]']
diff --git a/composer.json b/composer.json
@@ -25,26 +25,23 @@
         }
     },
     "require": {
-        "php": "^5.5.9|^7.0",
+        "php": "^5.6|^7.0",
         "symfony/symfony": "^3.2",
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/data-fixtures": "^1.0",
         "doctrine/doctrine-cache-bundle": "^1.2",
-        "twig/extensions": "^1.0",
-        "sensio/framework-extra-bundle": "^3.0.2",
-        "symfony/assetic-bundle": "^2.3",
-        "symfony/swiftmailer-bundle": "^2.3",
-        "symfony/monolog-bundle": "^3.0",
+        "symfony/swiftmailer-bundle": "^2.3.10",
+        "symfony/monolog-bundle": "^3.0.2",
         "symfony/polyfill-apcu": "^1.0",
+        "sensio/distribution-bundle": "^5.0",
+        "sensio/framework-extra-bundle": "^3.0.2",
         "symfony-cmf/symfony-cmf": "2.0.*",
-        "symfony-cmf/create-bundle": "2.0.*",
         "jackalope/jackalope-doctrine-dbal": "~1.1"
     },
     "require-dev": {
         "liip/functional-test-bundle": "~1.0",
         "sensio/generator-bundle": "~3.0",
-        "sensio/distribution-bundle": "^5.0",
         "incenteev/composer-parameter-handler": "~2.0",
         "symfony/phpunit-bridge": "~3.0"
     },