Merge pull request #11 from stefk/master

Fixes core init_test_schema command bug + deps

.travis.yml

@@ -1,5 +1,6 @@
 language: php
 php:
-  - 5.3
   - 5.4
-before_script: composer install --dev
+  - 5.5
+  - 5.6
+before_script: composer self-update && composer install --dev

Manager/Manager.php

@@ -11,7 +11,8 @@
 
 namespace Claroline\MigrationBundle\Manager;
 
-use Claroline\BundleRecorder\Log\LoggableTrait;
+use Psr\Log\LoggerAwareTrait;
+use Psr\Log\LogLevel;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Claroline\MigrationBundle\Generator\Generator;
 use Claroline\MigrationBundle\Generator\Writer;
@@ -22,12 +23,11 @@
  */
 class Manager
 {
-    use LoggableTrait;
+    use LoggerAwareTrait;
 
     private $generator;
     private $writer;
     private $migrator;
-    private $supportedPlatforms;
 
     /**
      * Constructor.
@@ -177,4 +177,11 @@ private function doMigrate(Bundle $bundle, $version, $direction)
                 "Done: bundle is now at version {$currentVersion}"
         );
     }
+
+    private function log($message)
+    {
+        if ($this->logger) {
+            $this->logger->log(LogLevel::INFO, $message);
+        }
+    }
 }

Migrator/Migrator.php

@@ -135,6 +135,7 @@ private function getConfiguration(Bundle $bundle)
         }
 
         $driverName = $this->connection->getDriver()->getName();
+
         $migrationsDir = "{$bundle->getPath()}/Migrations/{$driverName}";
         $migrationsName = "{$bundle->getName()} migration";
         $migrationsNamespace = "{$bundle->getNamespace()}\\Migrations\\{$driverName}";
@@ -145,7 +146,10 @@ private function getConfiguration(Bundle $bundle)
         $config->setMigrationsDirectory($migrationsDir);
         $config->setMigrationsNamespace($migrationsNamespace);
         $config->setMigrationsTableName($migrationsTableName);
-        $config->registerMigrationsFromDirectory($migrationsDir);
+
+        if (is_dir($migrationsDir)) {
+            $config->registerMigrationsFromDirectory($migrationsDir);
+        }
 
         $this->cacheConfigs[$bundle->getName()] = $config;
 

Tests/Manager/ManagerTest.php

@@ -64,7 +64,6 @@ public function testGenerateBundleMigration(array $queries, $areQueriesEmpty)
     public function testGetAvailablePlatforms()
     {
         $platforms = $this->manager->getAvailablePlatforms();
-        $this->assertGreaterThan(1, count($platforms));
         $this->assertContains('pdo_mysql', array_keys($platforms));
         $this->assertInstanceOf('Doctrine\DBAL\Platforms\AbstractPlatform', $platforms['pdo_mysql']);
     }

composer.json

@@ -13,14 +13,15 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.4.1",
         "symfony/framework-bundle": "*",
         "symfony/console": "~2.0",
         "symfony/twig-bridge": "~2.0",
         "symfony/twig-bundle": "~2.0",
         "doctrine/orm": "~2.2",
         "doctrine/migrations": "dev-master",
         "jdorn/sql-formatter": "~1.0",
+        "psr/log": "~1.0",
         "claroline/kernel-bundle": "~6.0"
     },
     "require-dev": {