new bundle directory layout

.gitignore

@@ -1,4 +1,4 @@
-Tests/Resources/app/cache
-Tests/Resources/app/logs
+tests/Resources/app/cache
+tests/Resources/app/logs
 composer.lock
 vendor

.travis.yml

@@ -4,28 +4,32 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 sudo: false
 
 cache:
   directories:
+    - .phpunit
     - $HOME/.composer/cache/files
 
 env:
-  matrix:
-    - SYMFONY_VERSION=2.8.* 
+  matrix: SYMFONY_VERSION=3.2.*
   global:
     - SYMFONY_DEPRECATIONS_HELPER=weak
+    - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
 
 matrix:
   include:
-    - php: 5.6
-      env: DEPS=dev SYMFONY_VERSION=3.1.*
     - php: 5.5
-      env: COMPOSER_FLAGS="--prefer-lowest"
-    - php: 5.6
-      env: DEPS=dev COMPOSER_FLAGS="--prefer-stable" SYMFONY_VERSION=3.0.*
+      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
+    #- php: nightly
+    #  env: DEPS=dev SYMFONY_VERSION=3.3.*
+    - php: 7.1
+      env: SYMFONY_VERSION=3.0.*
+    - php: 7.1
+      env: SYMFONY_VERSION=3.1.*
   fast_finish: true
 
 before_install:
@@ -39,7 +43,7 @@ install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
 
 before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 
-script: phpunit
+script: vendor/bin/simple-phpunit
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"

composer.json

@@ -25,10 +25,11 @@
         "sonata-project/admin-bundle": "^2.3.7|^3.0",
         "sonata-project/block-bundle": "^2.2.8|^3.0",
         "sonata-project/core-bundle": "^2.2.5|^3.0",
-        "symfony-cmf/routing-bundle": "^1.4|^2.0",
         "symfony-cmf/core-bundle": "^2.0",
+        "symfony-cmf/routing-bundle": "^1.4.0|^2.0",
         "matthiasnoback/symfony-dependency-injection-test": "^0.7.4",
         "matthiasnoback/symfony-config-test": "^1.3.1",
+        "symfony/phpunit-bridge": "^3.2",
         "burgov/key-value-form-bundle": "^1.0"
     },
     "minimum-stability": "dev",
@@ -39,11 +40,16 @@
         "doctrine/phpcr-bundle": "To persist the metadata in PHPCR ODM documents",
         "doctrine/doctrine-bundle": "To persist the metadata in ORM entities",
         "doctrine/orm": "To persist the metadata in ORM entities, ~2.4",
-        "burgov/key-value-form-bundle": "To edit the seo metadata 'extra' fields"
+        "symfony-cmf/sonata-admin-integration-bundle": "To provide an admin interface for the PHPCR ODM documents."
     },
     "autoload": {
         "psr-4": {
-            "Symfony\\Cmf\\Bundle\\SeoBundle\\": ""
+            "Symfony\\Cmf\\Bundle\\SeoBundle\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Symfony\\Cmf\\Bundle\\SeoBundle\\Tests\\": "tests/"
         }
     },
     "extra": {

phpunit.xml.dist

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     colors="true"
-    bootstrap="Tests/bootstrap.php"
+    bootstrap="./tests/bootstrap.php"
     >
 
     <testsuites>
         <testsuite name="Symfony SeoBundle Test Suite">
-            <directory>./Tests/Unit</directory>
+            <directory>./tests/Unit</directory>
         </testsuite>
 
         <testsuite name="phpcr">
-            <directory>./Tests/WebTest</directory>
-            <directory>./Tests/Functional/Doctrine/Phpcr</directory>
+            <directory>./tests/WebTest</directory>
+            <directory>./tests/Functional/Doctrine/Phpcr</directory>
         </testsuite>
 
         <testsuite name="orm">
-            <directory>./Tests/Functional/Doctrine/Orm</directory>
+            <directory>./tests/Functional/Doctrine/Orm</directory>
         </testsuite>
     </testsuites>
 
@@ -24,14 +24,14 @@
             <directory>.</directory>
             <exclude>
                 <directory>Resources/</directory>
-                <directory>Tests/</directory>
+                <directory>tests</directory>
                 <directory>vendor/</directory>
             </exclude>
         </whitelist>
     </filter>
 
     <php>
-        <server name="KERNEL_DIR" value="Tests/Resources/app" />
+        <server name="KERNEL_DIR" value="tests/Resources/app" />
     </php>
 
     <listeners>

Tests/Resources/app/AppKernel.php → tests/Resources/app/AppKernel.php

@@ -27,7 +27,6 @@ public function configure()
         $this->addBundles(array(
             new \Sonata\SeoBundle\SonataSeoBundle(),
             new \Symfony\Cmf\Bundle\SeoBundle\CmfSeoBundle(),
-            new \Burgov\Bundle\KeyValueFormBundle\BurgovKeyValueFormBundle(),
             new \Symfony\Cmf\Bundle\RoutingBundle\CmfRoutingBundle(),
             new \Symfony\Cmf\Bundle\CoreBundle\CmfCoreBundle(),
         ));

Tests/Resources/app/config/routing.php → tests/Resources/app/config/routing.php

@@ -13,6 +13,6 @@
 
 $collection = new RouteCollection();
 
-$collection->addCollection($loader->import(__DIR__.'/../../../../Resources/config/routing/sitemap.xml'));
+$collection->addCollection($loader->import(__DIR__.'/../../../../src/Resources/config/routing/sitemap.xml'));
 
 return $collection;

Tests/Unit/DependencyInjection/XmlSchemaTest.php → tests/Unit/DependencyInjection/XmlSchemaTest.php

@@ -18,7 +18,7 @@ class XmlSchemaTest extends XmlSchemaTestCase
     public function testSchema()
     {
         $xmlFiles = array_map(function ($file) {
-            return __DIR__.'/../../Resources/Fixtures/config/'.$file;
+            return __DIR__.'/../../../tests/Resources/Fixtures/config/'.$file;
         }, array(
             'config.xml',
             'config1.xml',
@@ -28,7 +28,7 @@ public function testSchema()
         ));
 
         foreach ($xmlFiles as $xmlFile) {
-            $this->assertSchemaAcceptsXml(array($xmlFile), __DIR__.'/../../../Resources/config/schema/seo-1.0.xsd');
+            $this->assertSchemaAcceptsXml(array($xmlFile), __DIR__.'/../../../src/Resources/config/schema/seo-1.0.xsd');
         }
     }
 }