Merge pull request #55 from alexislefebvre/move-files-to-src-and-test…

…s-directory Move files to src/ and tests/ directory
alexislefebvre · Aug 8, 2018 · 1bce372 · 1bce372
2 parents 8de0af9 + bce7fd0
commit 1bce372
Show file tree

Hide file tree

Showing 55 changed files with 45 additions and 40 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -11,4 +11,4 @@ ratings:
 
 exclude_paths:
   - DataFixtures/ORM/*
-  - Tests/*
+  - tests/*
diff --git a/.gitignore b/.gitignore
@@ -9,8 +9,8 @@
 /composer.lock
 
 # Ignore files created during tests
-/Tests/App/cache/
-/Tests/App/logs/
+/tests/App/cache/
+/tests/App/logs/
 /cov/
 
 # Ignore Doxygen directory

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -5,7 +5,7 @@ checks:
 
 filter:
   excluded_paths:
-    - Tests/*
+    - tests/*
     - Command/StatusesHomeTimelineTestCommand.php
   paths:
     - Command/*

diff --git a/Doxyfile b/Doxyfile
@@ -73,7 +73,7 @@ RECURSIVE              = YES
 # exclude all test directories for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       = */vendor/* \
-                         */Tests/App/*
+                         */tests/App/*
 
 #---------------------------------------------------------------------------
 # Configuration options related to the LaTeX output

diff --git a/behat.yml b/behat.yml
@@ -2,7 +2,7 @@ default:
     suites:
         default:
             paths:
-                features: Tests/Features
+                features: tests/Features
             contexts:
                 - 'AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\Features\Context\FeatureContext'
                 - Knp\FriendlyContexts\Context\AliceContext
@@ -14,22 +14,22 @@ default:
             kernel:
                 env: test
                 debug: true
-                path: Tests/App/AppKernel.php
-                bootstrap: Tests/App/bootstrap.php
+                path: tests/App/AppKernel.php
+                bootstrap: tests/App/bootstrap.php
         Behat\MinkExtension:
             sessions:
                 default:
                     symfony2: ~
         Knp\FriendlyContexts\Extension:
             symfony_kernel:
-                bootstrap: Tests/App/bootstrap.php
-                path: Tests/App/AppKernel.php
+                bootstrap: tests/App/bootstrap.php
+                path: tests/App/AppKernel.php
                 class: AppKernel
                 env: test
                 debug: true
             alice:
                 fixtures:
-                    User: Tests/Fixtures/User.yml
-                    Tweet: Tests/Fixtures/Tweet.yml
+                    User: tests/Fixtures/User.yml
+                    Tweet: tests/Fixtures/Tweet.yml
                 dependencies:
                     Tweet: [ User ]
diff --git a/composer.json b/composer.json
@@ -34,7 +34,12 @@
     },
     "autoload" : {
         "psr-4" : {
-            "AlexisLefebvre\\Bundle\\AsyncTweetsBundle\\" : ""
+            "AlexisLefebvre\\Bundle\\AsyncTweetsBundle\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "AlexisLefebvre\\Bundle\\AsyncTweetsBundle\\Tests\\": "tests/"
         }
     }
 }
diff --git a/phpspec.yml b/phpspec.yml
@@ -0,0 +1,3 @@
+suites:
+    tests:
+        spec_path: tests/
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -10,12 +10,12 @@
     convertWarningsToExceptions="true"
 >
     <php>
-        <server name="KERNEL_DIR" value="Tests/App" />
+        <server name="KERNEL_DIR" value="tests/App" />
     </php>
 
     <testsuites>
         <testsuite name="Project Test Suite">
-            <directory>Tests</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
@@ -27,7 +27,7 @@
             <directory>Utils</directory>
             <file>AsyncTweetsBundle.php</file>
             <exclude>
-                <directory>Tests</directory>
+                <directory>tests</directory>
                 <directory>vendor/</directory>
                 <file>Command/StatusesShowCommand.php</file>
             </exclude>

diff --git a/AsyncTweetsBundle.php → src/AsyncTweetsBundle.php b/AsyncTweetsBundle.php → src/AsyncTweetsBundle.php
diff --git a/Command/BaseCommand.php → src/Command/BaseCommand.php b/Command/BaseCommand.php → src/Command/BaseCommand.php
diff --git a/Command/StatusesHomeTimelineCommand.php → src/Command/StatusesHomeTimelineCommand.php b/Command/StatusesHomeTimelineCommand.php → src/Command/StatusesHomeTimelineCommand.php
diff --git a/Command/StatusesHomeTimelineTestCommand.php → ...mmand/StatusesHomeTimelineTestCommand.php b/Command/StatusesHomeTimelineTestCommand.php → ...mmand/StatusesHomeTimelineTestCommand.php
@@ -30,11 +30,8 @@ protected function configure()
      */
     protected function getTestContent($filename)
     {
-        /* @see https://insight.sensiolabs.com/what-we-analyse/symfony.dependency_injection.use_dir_file_constant */
         return json_decode(file_get_contents(
-            $this->container->get('kernel')->locateResource(
-                '@AsyncTweetsBundle/Tests/Command/data/'.$filename
-            )
+            sprintf(__DIR__.'/../../tests/Command/data/%s', $filename)
         ));
     }
 

diff --git a/Command/StatusesReadCommand.php → src/Command/StatusesReadCommand.php b/Command/StatusesReadCommand.php → src/Command/StatusesReadCommand.php
diff --git a/Command/StatusesShowCommand.php → src/Command/StatusesShowCommand.php b/Command/StatusesShowCommand.php → src/Command/StatusesShowCommand.php
diff --git a/Controller/DefaultController.php → src/Controller/DefaultController.php b/Controller/DefaultController.php → src/Controller/DefaultController.php
diff --git a/Entity/Media.php → src/Entity/Media.php b/Entity/Media.php → src/Entity/Media.php
diff --git a/Entity/Tweet.php → src/Entity/Tweet.php b/Entity/Tweet.php → src/Entity/Tweet.php
diff --git a/Entity/TweetRepository.php → src/Entity/TweetRepository.php b/Entity/TweetRepository.php → src/Entity/TweetRepository.php
diff --git a/Entity/User.php → src/Entity/User.php b/Entity/User.php → src/Entity/User.php
diff --git a/Resources/config/doctrine/Media.orm.yml → src/Resources/config/doctrine/Media.orm.yml b/Resources/config/doctrine/Media.orm.yml → src/Resources/config/doctrine/Media.orm.yml
diff --git a/Resources/config/doctrine/Tweet.orm.yml → src/Resources/config/doctrine/Tweet.orm.yml b/Resources/config/doctrine/Tweet.orm.yml → src/Resources/config/doctrine/Tweet.orm.yml
diff --git a/Resources/config/doctrine/User.orm.yml → src/Resources/config/doctrine/User.orm.yml b/Resources/config/doctrine/User.orm.yml → src/Resources/config/doctrine/User.orm.yml
diff --git a/Resources/config/routing.yml → src/Resources/config/routing.yml b/Resources/config/routing.yml → src/Resources/config/routing.yml
diff --git a/Resources/views/Default/index.html.twig → src/Resources/views/Default/index.html.twig b/Resources/views/Default/index.html.twig → src/Resources/views/Default/index.html.twig
diff --git a/...urces/views/Default/retweet_inc.html.twig → ...urces/views/Default/retweet_inc.html.twig b/...urces/views/Default/retweet_inc.html.twig → ...urces/views/Default/retweet_inc.html.twig
diff --git a/Resources/views/Default/tweet_inc.html.twig → ...sources/views/Default/tweet_inc.html.twig b/Resources/views/Default/tweet_inc.html.twig → ...sources/views/Default/tweet_inc.html.twig
diff --git a/Resources/views/layout.html.twig → src/Resources/views/layout.html.twig b/Resources/views/layout.html.twig → src/Resources/views/layout.html.twig
diff --git a/Utils/PersistTweet.php → src/Utils/PersistTweet.php b/Utils/PersistTweet.php → src/Utils/PersistTweet.php
diff --git a/Tests/App/AppKernel.php → tests/App/AppKernel.php b/Tests/App/AppKernel.php → tests/App/AppKernel.php
diff --git a/Tests/App/bootstrap.php → tests/App/bootstrap.php b/Tests/App/bootstrap.php → tests/App/bootstrap.php
diff --git a/Tests/App/config.yml → tests/App/config.yml b/Tests/App/config.yml → tests/App/config.yml
@@ -51,6 +51,6 @@ parameters:
     twitter_token_secret: null
 
 services:
-  AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\:
-        resource: '../../DataFixtures'
+  AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\:
+        resource: '../DataFixtures'
         tags: ['doctrine.fixture.orm']
diff --git a/Tests/App/routing.yml → tests/App/routing.yml b/Tests/App/routing.yml → tests/App/routing.yml
diff --git a/Tests/Command/StatusesBase.php → tests/Command/StatusesBase.php b/Tests/Command/StatusesBase.php → tests/Command/StatusesBase.php
diff --git a/Tests/Command/StatusesHomeTimelineTest.php → tests/Command/StatusesHomeTimelineTest.php b/Tests/Command/StatusesHomeTimelineTest.php → tests/Command/StatusesHomeTimelineTest.php
@@ -264,7 +264,7 @@ public function testStatusesHomeTimelineWithTweetAndRetweet()
     public function testStatusesHomeTimelineWithSinceIdParameter()
     {
         $this->loadFixtures([
-            'AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM\LoadTweetData',
+            'AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM\LoadTweetData',
         ]);
 
         // Disable decoration for tests on Windows

diff --git a/Tests/Command/StatusesReadTest.php → tests/Command/StatusesReadTest.php b/Tests/Command/StatusesReadTest.php → tests/Command/StatusesReadTest.php
@@ -41,7 +41,7 @@ public function testStatusesReadEmpty()
     public function testStatusesReadWithTweets()
     {
         $this->loadFixtures([
-            'AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM\LoadTweetData',
+            'AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM\LoadTweetData',
         ]);
 
         // Disable decoration for tests on Windows

diff --git a/Tests/Command/data/README.md → tests/Command/data/README.md b/Tests/Command/data/README.md → tests/Command/data/README.md
diff --git a/Tests/Command/data/tweet_with_retweet.json → tests/Command/data/tweet_with_retweet.json b/Tests/Command/data/tweet_with_retweet.json → tests/Command/data/tweet_with_retweet.json
diff --git a/Tests/Command/data/tweets_32_bits.json → tests/Command/data/tweets_32_bits.json b/Tests/Command/data/tweets_32_bits.json → tests/Command/data/tweets_32_bits.json
diff --git a/Tests/Controller/DefaultControllerTest.php → tests/Controller/DefaultControllerTest.php b/Tests/Controller/DefaultControllerTest.php → tests/Controller/DefaultControllerTest.php
@@ -35,7 +35,7 @@ public function testNoTweets()
     public function testTweets($path = null)
     {
         $this->loadFixtures([
-            'AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM\LoadTweetData',
+            'AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM\LoadTweetData',
         ]);
 
         if (is_null($path)) {
@@ -142,7 +142,7 @@ public function testSinceTweetId()
     public function testTweetsPages()
     {
         $this->loadFixtures([
-            'AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM\LoadTweetPagesData',
+            'AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM\LoadTweetPagesData',
         ]);
 
         $path = '/sinceId/15';
@@ -292,7 +292,7 @@ public function testTweetsPages()
     public function testCookie()
     {
         $this->loadFixtures([
-            'AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM\LoadTweetData',
+            'AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM\LoadTweetData',
         ]);
 
         $tweetId = 49664;
@@ -372,7 +372,7 @@ public function testCookie()
     public function testDeleteTweets()
     {
         $this->loadFixtures([
-            'AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM\LoadTweetPagesData',
+            'AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM\LoadTweetPagesData',
         ]);
 
         $path = '/sinceId/15';
@@ -591,7 +591,7 @@ public function testDeleteTweets()
     public function testHideRetweetedTweets()
     {
         $this->loadFixtures([
-            'AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM\LoadTweetAndRetweetData',
+            'AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM\LoadTweetAndRetweetData',
         ]);
 
         ////////// Homepage //////////

diff --git a/DataFixtures/ORM/LoadMediaData.php → tests/DataFixtures/ORM/LoadMediaData.php b/DataFixtures/ORM/LoadMediaData.php → tests/DataFixtures/ORM/LoadMediaData.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM;
+namespace AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM;
 
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\Media;
 use Doctrine\Common\DataFixtures\AbstractFixture;
@@ -46,6 +46,6 @@ public function load(ObjectManager $manager)
      */
     public function getDependencies()
     {
-        return ['AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM\LoadUserData'];
+        return ['AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM\LoadUserData'];
     }
 }
diff --git a/DataFixtures/ORM/LoadTweetAndRetweetData.php → ...aFixtures/ORM/LoadTweetAndRetweetData.php b/DataFixtures/ORM/LoadTweetAndRetweetData.php → ...aFixtures/ORM/LoadTweetAndRetweetData.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM;
+namespace AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM;
 
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\Tweet;
 use Doctrine\Common\DataFixtures\AbstractFixture;
@@ -83,7 +83,7 @@ public function load(ObjectManager $manager)
     public function getDependencies()
     {
         return [
-            'AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM\LoadMediaData',
+            'AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM\LoadMediaData',
         ];
     }
 }
diff --git a/DataFixtures/ORM/LoadTweetData.php → tests/DataFixtures/ORM/LoadTweetData.php b/DataFixtures/ORM/LoadTweetData.php → tests/DataFixtures/ORM/LoadTweetData.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM;
+namespace AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM;
 
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\Tweet;
 use Doctrine\Common\DataFixtures\AbstractFixture;
@@ -106,7 +106,7 @@ public function load(ObjectManager $manager)
     public function getDependencies()
     {
         return [
-            'AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM\LoadMediaData',
+            'AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM\LoadMediaData',
         ];
     }
 }
diff --git a/DataFixtures/ORM/LoadTweetPagesData.php → ...s/DataFixtures/ORM/LoadTweetPagesData.php b/DataFixtures/ORM/LoadTweetPagesData.php → ...s/DataFixtures/ORM/LoadTweetPagesData.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM;
+namespace AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM;
 
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\Tweet;
 use Doctrine\Common\DataFixtures\AbstractFixture;
@@ -78,7 +78,7 @@ public function load(ObjectManager $manager)
     public function getDependencies()
     {
         return [
-            'AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM\LoadMediaData',
+            'AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM\LoadMediaData',
         ];
     }
 }
diff --git a/DataFixtures/ORM/LoadUserData.php → tests/DataFixtures/ORM/LoadUserData.php b/DataFixtures/ORM/LoadUserData.php → tests/DataFixtures/ORM/LoadUserData.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM;
+namespace AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM;
 
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\User;
 use Doctrine\Common\DataFixtures\AbstractFixture;

diff --git a/Tests/Entity/MediaTest.php → tests/Entity/MediaTest.php b/Tests/Entity/MediaTest.php → tests/Entity/MediaTest.php
diff --git a/Tests/Entity/TweetRepositoryTest.php → tests/Entity/TweetRepositoryTest.php b/Tests/Entity/TweetRepositoryTest.php → tests/Entity/TweetRepositoryTest.php
@@ -22,7 +22,7 @@ public function setUp()
     public function testTweetRepository()
     {
         $this->loadFixtures([
-            'AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM\LoadTweetData',
+            'AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM\LoadTweetData',
         ]);
 
         $tweets = $this->em
@@ -53,7 +53,7 @@ public function testTweetRepository()
     public function testTweetRepositoryWithLongTweet()
     {
         $this->loadFixtures([
-            'AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\ORM\LoadTweetData',
+            'AlexisLefebvre\Bundle\AsyncTweetsBundle\Tests\DataFixtures\ORM\LoadTweetData',
         ]);
 
         /** @var Tweet $tweet */

diff --git a/Tests/Entity/TweetTest.php → tests/Entity/TweetTest.php b/Tests/Entity/TweetTest.php → tests/Entity/TweetTest.php
diff --git a/Tests/Entity/UserTest.php → tests/Entity/UserTest.php b/Tests/Entity/UserTest.php → tests/Entity/UserTest.php
diff --git a/Tests/Features/Context/FeatureContext.php → tests/Features/Context/FeatureContext.php b/Tests/Features/Context/FeatureContext.php → tests/Features/Context/FeatureContext.php
diff --git a/Tests/Features/Controller/Controller.feature → tests/Features/Controller/Controller.feature b/Tests/Features/Controller/Controller.feature → tests/Features/Controller/Controller.feature
diff --git a/...Controller/ControllerWithFixtures.feature → ...Controller/ControllerWithFixtures.feature b/...Controller/ControllerWithFixtures.feature → ...Controller/ControllerWithFixtures.feature
diff --git a/Tests/Features/Entity/Tweet.feature → tests/Features/Entity/Tweet.feature b/Tests/Features/Entity/Tweet.feature → tests/Features/Entity/Tweet.feature
diff --git a/Tests/Fixtures/Tweet.yml → tests/Fixtures/Tweet.yml b/Tests/Fixtures/Tweet.yml → tests/Fixtures/Tweet.yml
diff --git a/Tests/Fixtures/User.yml → tests/Fixtures/User.yml b/Tests/Fixtures/User.yml → tests/Fixtures/User.yml
diff --git a/...le/AsyncTweetsBundle/Entity/TweetSpec.php → ...le/AsyncTweetsBundle/Entity/TweetSpec.php b/...le/AsyncTweetsBundle/Entity/TweetSpec.php → ...le/AsyncTweetsBundle/Entity/TweetSpec.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,4 +11,4 @@ ratings: @@
     exclude_paths:
       - DataFixtures/ORM/*
-      - Tests/*
+      - tests/*