Merge pull request #3073 from stof/reorganize_files

Reorganize the source code

Author: stof

.gitattributes

@@ -2,10 +2,10 @@
 /.gitattributes   export-ignore
 /.gitignore       export-ignore
 /.php-cs-fixer.dist.php export-ignore
-/.travis.yml      export-ignore
 /Changelog.md     export-ignore
 /Makefile         export-ignore
 /README.md        export-ignore
-/Tests            export-ignore
+/docs/           export-ignore
+/tests/           export-ignore
 /Upgrade.md       export-ignore
 /phpunit.xml.dist export-ignore

README.md

@@ -66,18 +66,12 @@
     },
     "autoload": {
         "psr-4": {
-            "FOS\\UserBundle\\": ""
-        },
-        "exclude-from-classmap": [
-            "/Tests/"
-        ]
+            "FOS\\UserBundle\\": "src"
+        }
     },
     "autoload-dev": {
         "psr-4": {
-            "FOS\\UserBundle\\Tests\\": "/Tests/"
+            "FOS\\UserBundle\\Tests\\": "tests"
         }
-    },
-    "support": {
-        "docs": "https://symfony.com/doc/master/bundles/FOSUserBundle/index.html"
     }
 }

composer.json

@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./tests/bootstrap.php" colors="true">
 
     <testsuites>
         <testsuite name="FOSUserBundle test suite">
-            <directory suffix="Test.php">./Tests</directory>
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>./</directory>
+            <directory>src/</directory>
             <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
+                <directory>src/Resources</directory>
             </exclude>
         </whitelist>
     </filter>
 
     <php>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="ignoreFile=Tests/ignored-deprecations.txt&amp;max[total]=0" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="ignoreFile=tests/ignored-deprecations.txt&amp;max[total]=0" />
     </php>
 </phpunit>

Resources/doc/adding_invitation_registration.rst renamed to docs/adding_invitation_registration.rst

@@ -30,17 +30,17 @@ public function testLoadRouting($routeName, $path, array $methods)
         $loader = new XmlFileLoader($locator);
 
         $collection = new RouteCollection();
-        $collection->addCollection($loader->load(__DIR__.'/../../Resources/config/routing/change_password.xml'));
-        $subCollection = $loader->load(__DIR__.'/../../Resources/config/routing/profile.xml');
+        $collection->addCollection($loader->load(__DIR__.'/../../src/Resources/config/routing/change_password.xml'));
+        $subCollection = $loader->load(__DIR__.'/../../src/Resources/config/routing/profile.xml');
         $subCollection->addPrefix('/profile');
         $collection->addCollection($subCollection);
-        $subCollection = $loader->load(__DIR__.'/../../Resources/config/routing/registration.xml');
+        $subCollection = $loader->load(__DIR__.'/../../src/Resources/config/routing/registration.xml');
         $subCollection->addPrefix('/register');
         $collection->addCollection($subCollection);
-        $subCollection = $loader->load(__DIR__.'/../../Resources/config/routing/resetting.xml');
+        $subCollection = $loader->load(__DIR__.'/../../src/Resources/config/routing/resetting.xml');
         $subCollection->addPrefix('/resetting');
         $collection->addCollection($subCollection);
-        $collection->addCollection($loader->load(__DIR__.'/../../Resources/config/routing/security.xml'));
+        $collection->addCollection($loader->load(__DIR__.'/../../src/Resources/config/routing/security.xml'));
 
         $route = $collection->get($routeName);
         $this->assertNotNull($route, sprintf('The route "%s" should exists', $routeName));