simplify test's bootstrap

KnpLabs · Sep 15, 2014 · 71c610d · 71c610d
1 parent 3f2fe97
commit 71c610d
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 105 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
-tests/phpunit.xml
-tests/temp/*.php
-vendor/*
+/tests/phpunit.xml
+/tests/temp/*.php
+/vendor
 tags
+/composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -7,12 +7,12 @@ php:
     - 5.5
     - 5.6
     - hhvm
- 
+
 matrix:
     allow_failures:
         - php: hhvm
-        
+
 before_script:
-    - php bin/vendors.php
+    - composer install --prefer-dist
 
 script: phpunit -c tests
diff --git a/README.md b/README.md
@@ -11,6 +11,5 @@ PHPUnit 3.5 or newer is required.
 To setup and run tests follow these steps:
 
 - go to the root directory of components
-- run: **php bin/vendors.php**
 - run: **phpunit -c tests**
 
diff --git a/bin/vendors.php b/bin/vendors.php
diff --git a/composer.json b/composer.json
@@ -20,6 +20,13 @@
     "require": {
         "php": ">=5.3.2"
     },
+    "require-dev": {
+        "symfony/class-loader": "~2.5",
+        "symfony/event-dispatcher": "~2.5",
+        "doctrine/orm": "~2.4",
+        "doctrine/mongodb-odm": "~1.0@beta",
+        "phpunit/phpunit": "~4.2"
+    },
 
     "suggest": {
         "doctrine/orm" : "to allow usage pagination with Doctrine ORM",
@@ -38,7 +45,12 @@
 
     "autoload": {
         "psr-0": {
-            "Knp\\Component": "src/"
+            "Knp\\Component": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-0": {
+            "Test": "tests"
         }
     }
 }
diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/GridFsTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/GridFsTest.php
@@ -29,7 +29,7 @@ function shouldPaginate()
 
     private function populate()
     {
-        $mockFile = realpath(TESTS_PATH.'/temp/summer.gif');
+        $mockFile = __DIR__.'/summer.gif';
         $dm = $this->getMockDocumentManager();
         $summer = new Image;
         $summer->setTitle('summer');

diff --git a/tests/temp/summer.gif → .../Paginate/Doctrine/ODM/MongoDB/summer.gif b/tests/temp/summer.gif → .../Paginate/Doctrine/ODM/MongoDB/summer.gif
diff --git a/tests/Test/Tool/BaseTestCaseMongoODM.php b/tests/Test/Tool/BaseTestCaseMongoODM.php
@@ -23,7 +23,7 @@ abstract class BaseTestCaseMongoODM extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        if (!class_exists('Mongo')) {
+        if (!class_exists('MongoClient')) {
             $this->markTestSkipped('Missing Mongo extension.');
         }
     }

diff --git a/tests/Test/Tool/QueryAnalyzer.php b/tests/Test/Tool/QueryAnalyzer.php
@@ -193,7 +193,7 @@ private function generateSql($sql, $params, $types)
         if (is_int(key($params))) {
             $index = key($converted);
             $sql = preg_replace_callback('@\?@sm', function($match) use (&$index, $converted) {
-                return $converted[$index++];
+                return implode(' ', $converted[$index++]);
             }, $sql);
         } else {
             foreach ($converted as $key => $value) {
@@ -239,4 +239,4 @@ private function getConvertedParams($params, $types)
         }
         return $result;
     }
-}
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,49 +1,8 @@
 <?php
 
-/**
- * This is bootstrap for phpUnit unit tests,
- * use README.md for more details
- */
-
-if (!class_exists('PHPUnit_Framework_TestCase') ||
-    version_compare(PHPUnit_Runner_Version::id(), '3.5') < 0
-) {
-    die('PHPUnit framework is required, at least 3.5 version');
-}
-
-if (!class_exists('PHPUnit_Framework_MockObject_MockBuilder')) {
-    die('PHPUnit MockObject plugin is required, at least 1.0.8 version');
-}
-
-define('TESTS_PATH', __DIR__);
-define('VENDOR_PATH', realpath(__DIR__ . '/../vendor'));
-
-$classLoaderFile = VENDOR_PATH . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-if (!file_exists($classLoaderFile)) {
-    die('cannot find vendor, run: php bin/vendors.php');
-}
-require_once $classLoaderFile;
-$loader = new Symfony\Component\ClassLoader\UniversalClassLoader;
-$loader->registerNamespaces(array(
-    'Symfony'                    => VENDOR_PATH,
-    'Knp'                        => __DIR__.'/../src',
-    'Test'                       => __DIR__,
-    'Doctrine\\Common'           => VENDOR_PATH.'/doctrine-common/lib',
-    'Doctrine\\DBAL'             => VENDOR_PATH.'/doctrine-dbal/lib',
-    'Doctrine\\ORM'              => VENDOR_PATH.'/doctrine-orm/lib',
-    'Doctrine\\MongoDB'          => VENDOR_PATH.'/doctrine-mongodb/lib',
-    'Doctrine\\ODM\\MongoDB'     => VENDOR_PATH.'/doctrine-mongodb-odm/lib',
-));
-$loader->register();
-
-\Doctrine\Common\Annotations\AnnotationRegistry::registerFile(
-    VENDOR_PATH.'/doctrine-orm/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php'
-);
-
-\Doctrine\Common\Annotations\AnnotationRegistry::registerFile(
-    VENDOR_PATH.'/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/DoctrineAnnotations.php'
-);
+require __DIR__.'/../vendor/autoload.php';
 
+\Doctrine\Common\Annotations\AnnotationRegistry::registerLoader('class_exists');
 $reader = new \Doctrine\Common\Annotations\AnnotationReader();
 $reader = new \Doctrine\Common\Annotations\CachedReader($reader, new \Doctrine\Common\Cache\ArrayCache());
 $_ENV['annotation_reader'] = $reader;