use composer to load test lib, and run test with SF 2.3 and 2.4

Author: Cédric Girard

.gitignore

@@ -4,3 +4,4 @@ phpunit.xml
 .buildpath
 .settings
 vendor
+composer.lock

.travis.yml

@@ -4,10 +4,15 @@ php:
   - 5.3
 
 env:
-  - SYMFONY_VERSION=v2.2
-  - SYMFONY_VERSION=v2.3
+  - SYMFONY_VERSION=2.3.* DOCTRINE_ORM_VERSION=2.4.* DOCTRINE_BUNDLE_VERSION=1.2.*
+  - SYMFONY_VERSION=2.4.* DOCTRINE_ORM_VERSION=2.4.* DOCTRINE_BUNDLE_VERSION=1.2.*
 
-before_script: 
-  - php Tests/vendors.php
+before_script:
+  - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
+  - composer require doctrine/doctrine-bundle:${DOCTRINE_BUNDLE_VERSION} --no-update
+  - composer require doctrine/orm:${DOCTRINE_ORM_VERSION} --no-update
+  - composer require doctrine/data-fixtures:1.0.*
+  - composer require twig/twig:1.15.*
+  - composer update --dev
 
 script: phpunit

Tests/Unit/BaseUnitTestCase.php

@@ -5,7 +5,6 @@
 use Lexik\Bundle\CurrencyBundle\Tests\Fixtures\CurrencyData;
 
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Mapping\DefaultQuoteStrategy;
 use Doctrine\Common\DataFixtures\Executor\ORMExecutor;
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;
 use Doctrine\Common\Annotations\AnnotationReader;
@@ -81,10 +80,13 @@ protected function getMockSqliteEntityManager()
             ->will($this->returnValue('Doctrine\ORM\Mapping\ClassMetadataFactory'));
         $config->expects($this->any())
             ->method('getDefaultRepositoryClassName')
-            ->will($this->returnValue('Doctrine\\ORM\\EntityRepository'));
+            ->will($this->returnValue('Doctrine\ORM\EntityRepository'));
+        $config->expects($this->any())
+            ->method('getRepositoryFactory')
+            ->will($this->returnValue(new \Doctrine\ORM\Repository\DefaultRepositoryFactory()));
         $config->expects($this->any())
             ->method('getQuoteStrategy')
-            ->will($this->returnValue(new DefaultQuoteStrategy()));
+            ->will($this->returnValue(new \Doctrine\ORM\Mapping\DefaultQuoteStrategy()));
 
         $conn = array(
             'driver' => 'pdo_sqlite',

Tests/autoload.php.dist

@@ -0,0 +1,10 @@
+<?php
+
+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);
+}

Tests/bootstrap.php

@@ -1,7 +1,7 @@
 <?php
 
-if (file_exists($file = __DIR__.'/../autoload.php')) {
+if (file_exists($file = __DIR__.'/autoload.php')) {
     require_once $file;
-} elseif (file_exists($file = __DIR__.'/../autoload.php.dist')) {
+} elseif (file_exists($file = __DIR__.'/autoload.php.dist')) {
     require_once $file;
 }