Merge pull request #329 from symfony-cmf/sf3

Run on Symfony 3.1

Author: dbu

.styleci.yml

@@ -1,3 +1,3 @@
 preset: symfony
 
-disabled: [phpdoc_to_comment]
+disabled: [phpdoc_to_comment, phpdoc_var_without_name]

.travis.yml

@@ -1,11 +1,9 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
   - 5.5
-  # 5.6 is tested using composer install
-  - 7.0
+  - 5.6
+  # 7.0 is tested using composer install
   - hhvm
 
 sudo: false
@@ -17,18 +15,22 @@ cache:
 matrix:
   fast_finish: true
   include:
-    - php: 5.6
+    - php: 7.0
       env: TRANSPORT=jackrabbit COMPOSER_INSTALL=1
-    - php: 5.6
+    - php: 7.0
       env: TRANSPORT=doctrine_dbal COMPOSER_INSTALL=1
 
 env:
-  - TRANSPORT=jackrabbit
-  - TRANSPORT=doctrine_dbal
+  global:
+    - SYMFONY_DEPRECATIONS_HELPER=weak
+  matrix:
+    - TRANSPORT=jackrabbit
+    - TRANSPORT=doctrine_dbal
 
 before_install:
-  - composer self-update
   - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
+  - phpenv config-rm xdebug.ini || true
+  - composer self-update
 
 install: if [ "$COMPOSER_INSTALL" != "1" ]; then composer update --no-scripts --prefer-dist; else composer install --no-scripts --prefer-dist; fi
 

app/AppKernel.php

@@ -37,8 +37,9 @@ public function registerBundles()
             new Symfony\Cmf\Bundle\TreeBrowserBundle\CmfTreeBrowserBundle(),
             new Symfony\Cmf\Bundle\BlockBundle\CmfBlockBundle(),
             new Symfony\Cmf\Bundle\SeoBundle\CmfSeoBundle(),
-            new Burgov\Bundle\KeyValueFormBundle\BurgovKeyValueFormBundle(),
             new Symfony\Cmf\Bundle\RoutingAutoBundle\CmfRoutingAutoBundle(),
+            new Symfony\Cmf\Bundle\ResourceBundle\CmfResourceBundle(),
+            new Symfony\Cmf\Bundle\ResourceRestBundle\CmfResourceRestBundle(),
 
             // language switcher
             new Lunetics\LocaleBundle\LuneticsLocaleBundle(),
@@ -48,15 +49,14 @@ public function registerBundles()
             new JMS\SerializerBundle\JMSSerializerBundle(),
 
             // admin bundle
-            new Sonata\jQueryBundle\SonatajQueryBundle(),
             new Sonata\BlockBundle\SonataBlockBundle(),
             new Sonata\CoreBundle\SonataCoreBundle(),
             new Sonata\AdminBundle\SonataAdminBundle(),
             new Sonata\DoctrinePHPCRAdminBundle\SonataDoctrinePHPCRAdminBundle(),
             new Sonata\SeoBundle\SonataSeoBundle(),
             new Sonata\TranslationBundle\SonataTranslationBundle(),
-            new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
             new Ivory\CKEditorBundle\IvoryCKEditorBundle(),
+            new Burgov\Bundle\KeyValueFormBundle\BurgovKeyValueFormBundle(),
 
             // jackalope doctrine caching
             new Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle(),

app/autoload.php

@@ -9,23 +9,13 @@
  * file that was distributed with this source code.
  */
 
-if (!$loader = include __DIR__.'/../vendor/autoload.php') {
-    $nl = PHP_SAPI === 'cli' ? PHP_EOL : '<br />';
-    echo "$nl$nl";
-    die('You must set up the project dependencies.'.$nl.
-        'Run the following commands in '.dirname(__DIR__).':'.$nl.$nl.
-        'curl -s http://getcomposer.org/installer | php'.$nl.
-        'php composer.phar install'.$nl);
-}
-
 use Doctrine\Common\Annotations\AnnotationRegistry;
+use Composer\Autoload\ClassLoader;
 
-// intl
-if (!function_exists('intl_get_error_code')) {
-    require_once __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs/functions.php';
-
-    $loader->add('', __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs');
-}
+/**
+ * @var ClassLoader $loader
+ */
+$loader = require __DIR__.'/../vendor/autoload.php';
 
 AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
 

app/config/config.yml

@@ -118,6 +118,15 @@ cmf_menu:
     voters:
         content_identity: ~
 
+cmf_resource:
+    repositories:
+        default:
+            type: doctrine_phpcr_odm
+
+cmf_resource_rest:
+    enhancer_map:
+        - { repository: default, enhancer: sonata_admin }
+
 sonata_block:
     default_contexts: [cms]
     blocks:

app/config/routing.yml

@@ -8,29 +8,29 @@ _app:
     type: annotation
 
 home_redirect:
-    pattern: /
+    path: /
     defaults:
         _controller: lunetics_locale.switcher_controller:switchAction
         route: '/cms/routes/%locale%'
         statusCode: 301
         useReferrer: false
 
 admin_wo_locale:
-    pattern: /admin
+    path: /admin
     defaults:
         _controller: FrameworkBundle:Redirect:redirect
         route: sonata_admin_dashboard
         permanent: true # this for 301
 
 admin_dashboard_wo_locale:
-    pattern: /admin/dashboard
+    path: /admin/dashboard
     defaults:
         _controller: FrameworkBundle:Redirect:redirect
         route: sonata_admin_dashboard
         permanent: true # this for 301
 
 admin_dashboard:
-    pattern: /{_locale}/admin/
+    path: /{_locale}/admin/
     defaults:
         _controller: FrameworkBundle:Redirect:redirect
         route: sonata_admin_dashboard
@@ -45,13 +45,10 @@ sonata_admin:
     type: sonata_admin
     prefix: /{_locale}/admin
 
-fos_js_routing:
-    resource: '@FOSJsRoutingBundle/Resources/config/routing/routing.xml'
-
-cmf_tree:
-    resource: .
-    type: 'cmf_tree'
-
 block_cache:
     resource: '@CmfBlockBundle/Resources/config/routing/cache.xml'
     prefix: /
+
+cmf_resource:
+    resource: '@CmfResourceRestBundle/Resources/config/routing.yml'
+    prefix: /admin

app/config/routing_dev.yml

@@ -6,11 +6,5 @@ _profiler:
     resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
     prefix:   /_profiler
 
-_configurator:
-    resource: '@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml'
-    prefix: /_configurator
-
 _main:
     resource: routing.yml
-
-

app/config/security.yml

@@ -25,5 +25,3 @@ security:
     access_control:
         - { path: ^(/(de|fr|en))?/admin, roles: ROLE_ADMIN }
         #- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
-        - { path: ^/efconnect, role: ROLE_USER }
-        - { path: ^/elfinder, role: ROLE_USER }

app/console

@@ -1,22 +1,29 @@
 #!/usr/bin/env php
 <?php
 
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Debug\Debug;
+
 // if you don't want to setup permissions the proper way, just uncomment the following PHP line
 // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
 //umask(0000);
 
 set_time_limit(0);
 
-require_once __DIR__.'/bootstrap.php.cache';
-require_once __DIR__.'/AppKernel.php';
-
-use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
+/**
+ * @var Composer\Autoload\ClassLoader $loader
+ */
+$loader = require __DIR__.'/../app/autoload.php';
 
 $input = new ArgvInput();
 $env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
 $debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
 
+if ($debug) {
+    Debug::enable();
+}
+
 $kernel = new AppKernel($env, $debug);
 $application = new Application($kernel);
 $application->run($input);

app/phpunit.xml.dist

@@ -11,7 +11,7 @@
     processIsolation="false"
     stopOnFailure="false"
     syntaxCheck="false"
-    bootstrap="tests/bootstrap.php" >
+    bootstrap="autoload.php">
 
     <testsuites>
         <testsuite name="Project Test Suite">