Fix/tdr 5/servicemanager init

common/oatbox/install/Installer.php

@@ -72,8 +72,10 @@ public function setupServiceManager($configPath)
                 'dir' => $configPath,
                 'humanReadable' => true
             ));
+            $sm = new ServiceManager($configService);
+            ServiceManager::setServiceManager($sm);
 
-            $this->setServiceManager(new ServiceManager($configService));
+            $this->setServiceLocator($sm);
         }
 
         return $this->getServiceManager();

common/persistence/sql/SetupDb.php

@@ -41,10 +41,7 @@ class SetupDb implements LoggerAwareInterface
     public function setupDatabase(\common_persistence_SqlPersistence $p)
     {
         $dbalDriver = $p->getDriver();
-        if (!$dbalDriver instanceof \common_persistence_sql_dbal_Driver) {
-            throw new \common_exception_InconsistentData('Non DBAL driver no longer supported');
-        }
-        $dbName = $dbalDriver->getDataBase();
+        $dbName = $dbalDriver->getDbalConnection()->getDatabase();
         $this->verifyDatabase($p, $dbName);
         $this->cleanDb($p);
         $this->setupTables($p);

helpers/class.File.php

@@ -170,7 +170,7 @@ static public function emptyDirectory($path, $ignoreSystemFiles = false)
                     continue;
                 }
 
-                $success = self::remove($path . DIRECTORY_SEPARATOR . $entry) ? $success : false;
+                $success = self::remove($path . DIRECTORY_SEPARATOR . $entry) && $success;
             }
         }
         closedir($handle);

manifest.php

@@ -32,7 +32,7 @@
     'label' => 'Generis Core',
     'description' => 'Core extension, provide the low level framework and an API to manage ontologies',
     'license' => 'GPL-2.0',
-    'version' => '12.5.6',
+    'version' => '12.5.7',
     'author' => 'Open Assessment Technologies, CRP Henri Tudor',
     'requires' => array(),
     'models' => array(

scripts/update/Updater.php

@@ -475,6 +475,6 @@ public function update($initialVersion)
             }
             $this->setVersion('12.4.1');
         }
-        $this->skip('12.4.1', '12.5.6');
+        $this->skip('12.4.1', '12.5.7');
     }
 }