Updated dependencies and align with renamed namespaces.

DatabaseStratum · Sep 26, 2019 · b0482b9 · b0482b9
1 parent 822df52
commit b0482b9
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 38 deletions.
diff --git a/composer.json b/composer.json
@@ -18,15 +18,15 @@
     "ext-pdo": "*",
     "setbased/exception": "^1.0.0",
     "setbased/helper-code-store-php": "^2.2.0",
-    "setbased/php-stratum-backend": "^4.0.0",
-    "setbased/php-stratum-common": "^4.0.0",
-    "setbased/php-stratum-middle": "^4.0.0",
+    "setbased/php-stratum-backend": "^5.0.0",
+    "setbased/php-stratum-common": "^5.0.0",
+    "setbased/php-stratum-middle": "^5.0.0",
     "zendframework/zend-code": "^3.0.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.0.0 || ^8.0.0",
     "phing/phing": "^2.0.0",
-    "setbased/php-stratum": "^4.0.0"
+    "setbased/php-stratum": "^5.0.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/Backend/SqlitePdoBackend.php b/src/Backend/SqlitePdoBackend.php
@@ -3,11 +3,11 @@
 
 namespace SetBased\Stratum\SqlitePdo\Backend;
 
-use SetBased\Stratum\Backend;
-use SetBased\Stratum\Config;
-use SetBased\Stratum\RoutineLoaderWorker;
-use SetBased\Stratum\RoutineWrapperGeneratorWorker;
-use SetBased\Stratum\StratumStyle;
+use SetBased\Stratum\Backend\Backend;
+use SetBased\Stratum\Backend\Config;
+use SetBased\Stratum\Backend\RoutineLoaderWorker;
+use SetBased\Stratum\Backend\RoutineWrapperGeneratorWorker;
+use SetBased\Stratum\Backend\StratumStyle;
 
 /**
  * The PhpStratum's backend for SQLite using PDO.

diff --git a/src/Backend/SqlitePdoRoutineLoaderWorker.php b/src/Backend/SqlitePdoRoutineLoaderWorker.php
@@ -4,10 +4,10 @@
 namespace SetBased\Stratum\SqlitePdo\Backend;
 
 use SetBased\Exception\RuntimeException;
-use SetBased\Stratum\Exception\RoutineLoaderException;
-use SetBased\Stratum\Helper\SourceFinderHelper;
-use SetBased\Stratum\NameMangler\NameMangler;
-use SetBased\Stratum\RoutineLoaderWorker;
+use SetBased\Stratum\Backend\RoutineLoaderWorker;
+use SetBased\Stratum\Common\Exception\RoutineLoaderException;
+use SetBased\Stratum\Common\Helper\SourceFinderHelper;
+use SetBased\Stratum\Middle\NameMangler\NameMangler;
 use SetBased\Stratum\SqlitePdo\Helper\RoutineLoaderHelper;
 
 /**

diff --git a/src/Backend/SqlitePdoRoutineWrapperGeneratorPdoWorker.php b/src/Backend/SqlitePdoRoutineWrapperGeneratorPdoWorker.php
@@ -5,8 +5,8 @@
 
 use SetBased\Exception\RuntimeException;
 use SetBased\Helper\CodeStore\PhpCodeStore;
-use SetBased\Stratum\NameMangler\NameMangler;
-use SetBased\Stratum\RoutineWrapperGeneratorWorker;
+use SetBased\Stratum\Backend\RoutineWrapperGeneratorWorker;
+use SetBased\Stratum\Middle\NameMangler\NameMangler;
 use SetBased\Stratum\SqlitePdo\Wrapper\Wrapper;
 
 /**
@@ -72,7 +72,6 @@ class SqlitePdoRoutineWrapperGeneratorPdoWorker extends SqlitePdoWorker implemen
   private $wrapperFilename;
 
   //--------------------------------------------------------------------------------------------------------------------
-
   /**
    * @inheritdoc
    */

diff --git a/src/Backend/SqlitePdoWorker.php b/src/Backend/SqlitePdoWorker.php
@@ -3,8 +3,8 @@
 
 namespace SetBased\Stratum\SqlitePdo\Backend;
 
-use SetBased\Stratum\Config;
-use SetBased\Stratum\StratumStyle;
+use SetBased\Stratum\Backend\Config;
+use SetBased\Stratum\Backend\StratumStyle;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 
 /**

diff --git a/src/Exception/SqlitePdoDataLayerException.php b/src/Exception/SqlitePdoDataLayerException.php
@@ -3,7 +3,7 @@
 
 namespace SetBased\Stratum\SqlitePdo\Exception;
 
-use SetBased\Stratum\Exception\DataLayerException;
+use SetBased\Stratum\Middle\Exception\DataLayerException;
 
 /**
  * Exception for situations where the execution of a SQL query has failed.
@@ -41,7 +41,7 @@ class SqlitePdoDataLayerException extends \RuntimeException implements DataLayer
    * @param string|null $method The name of the executed method.
    * @param string|null $query  The executed query.
    */
-  public function __construct(string $code, string $error, ?string $method, ?string $query=null)
+  public function __construct(string $code, string $error, ?string $method, ?string $query = null)
   {
     parent::__construct(self::message($code, $error, $method, $query));
 

diff --git a/src/Exception/SqlitePdoQueryErrorException.php b/src/Exception/SqlitePdoQueryErrorException.php
@@ -3,7 +3,7 @@
 
 namespace SetBased\Stratum\SqlitePdo\Exception;
 
-use SetBased\Stratum\Exception\QueryErrorException;
+use SetBased\Stratum\Middle\Exception\QueryErrorException;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 
 /**
@@ -23,10 +23,10 @@ class SqlitePdoQueryErrorException extends SqlitePdoDataLayerException implement
   /**
    * Object constructor.
    *
-   * @param int    $errno The error code value of the error ($mysqli->errno).
-   * @param string $error Description of the last error ($mysqli->error).
+   * @param int    $errno  The error code value of the error ($mysqli->errno).
+   * @param string $error  Description of the last error ($mysqli->error).
    * @param string $method The name of the executed method.
-   * @param string $query The failed query.
+   * @param string $query  The failed query.
    */
   public function __construct(int $errno, string $error, string $method, string $query)
   {

diff --git a/src/Helper/RoutineLoaderHelper.php b/src/Helper/RoutineLoaderHelper.php
@@ -3,11 +3,11 @@
 
 namespace SetBased\Stratum\SqlitePdo\Helper;
 
-use SetBased\Stratum\Exception\RoutineLoaderException;
-use SetBased\Stratum\Helper\RowSetHelper;
+use SetBased\Stratum\Backend\StratumStyle;
+use SetBased\Stratum\Common\Exception\RoutineLoaderException;
+use SetBased\Stratum\Middle\Helper\RowSetHelper;
 use SetBased\Stratum\SqlitePdo\Reflection\ParamTag;
 use SetBased\Stratum\SqlitePdo\SqlitePdoDataLayer;
-use SetBased\Stratum\StratumStyle;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Zend\Code\Reflection\DocBlock\Tag\GenericTag;
 use Zend\Code\Reflection\DocBlock\Tag\ReturnTag;
@@ -140,7 +140,6 @@ class RoutineLoaderHelper
   private $sourceFilename;
 
   //--------------------------------------------------------------------------------------------------------------------
-
   /**
    * Object constructor.
    *
@@ -450,6 +449,7 @@ private function parameterDescription(string $name): ?string
   private function parameterType(string $name): string
   {
     $key = RowSetHelper::findInRowSet($this->docBlockPartsSource['parameters'], 'name', $name);
+
     return $this->docBlockPartsSource['parameters'][$key]['type'];
   }
 

diff --git a/src/SqlitePdoDataLayer.php b/src/SqlitePdoDataLayer.php
@@ -6,7 +6,7 @@
 use SetBased\Abc\Helper\Cast;
 use SetBased\Exception\FallenException;
 use SetBased\Exception\LogicException;
-use SetBased\Stratum\Exception\ResultException;
+use SetBased\Stratum\Middle\Exception\ResultException;
 use SetBased\Stratum\SqlitePdo\Exception\SqlitePdoDataLayerException;
 
 /**

diff --git a/src/Wrapper/Wrapper.php b/src/Wrapper/Wrapper.php
@@ -5,7 +5,7 @@
 
 use SetBased\Exception\FallenException;
 use SetBased\Helper\CodeStore\PhpCodeStore;
-use SetBased\Stratum\NameMangler\NameMangler;
+use SetBased\Stratum\Middle\NameMangler\NameMangler;
 use SetBased\Stratum\SqlitePdo\Helper\DataTypeHelper;
 
 /**
@@ -43,7 +43,6 @@ abstract class Wrapper
   protected $routine;
 
   //--------------------------------------------------------------------------------------------------------------------
-
   /**
    * Object constructor.
    *

diff --git a/test/Application/StratumApplicationTest.php b/test/Application/StratumApplicationTest.php
@@ -4,7 +4,7 @@
 namespace SetBased\Stratum\SqlitePdo\Test\Application;
 
 use PHPUnit\Framework\TestCase;
-use SetBased\Stratum\Application\Stratum;
+use SetBased\Stratum\Frontend\Application\Stratum;
 use Symfony\Component\Console\Tester\ApplicationTester;
 
 /**

diff --git a/test/QuoteTest.php b/test/QuoteTest.php
@@ -91,6 +91,6 @@ public function testValid()
   }
 
   //--------------------------------------------------------------------------------------------------------------------
-
 }
+
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/test/Row0Test.php b/test/Row0Test.php
@@ -3,7 +3,7 @@
 
 namespace SetBased\Stratum\SqlitePdo\Test;
 
-use SetBased\Stratum\Exception\ResultException;
+use SetBased\Stratum\Middle\Exception\ResultException;
 
 /**
  * Test cases for stored routines with designation type row0.

diff --git a/test/Row1Test.php b/test/Row1Test.php
@@ -3,7 +3,7 @@
 
 namespace SetBased\Stratum\SqlitePdo\Test;
 
-use SetBased\Stratum\Exception\ResultException;
+use SetBased\Stratum\Middle\Exception\ResultException;
 
 /**
  * Test cases for stored routines with designation type row1.

diff --git a/test/Singleton0Test.php b/test/Singleton0Test.php
@@ -3,7 +3,7 @@
 
 namespace SetBased\Stratum\SqlitePdo\Test;
 
-use SetBased\Stratum\Exception\ResultException;
+use SetBased\Stratum\Middle\Exception\ResultException;
 
 /**
  * Test cases for stored routines with designation type singleton0.

diff --git a/test/Singleton1Test.php b/test/Singleton1Test.php
@@ -3,7 +3,7 @@
 
 namespace SetBased\Stratum\SqlitePdo\Test;
 
-use SetBased\Stratum\Exception\ResultException;
+use SetBased\Stratum\Middle\Exception\ResultException;
 
 /**
  * Test cases for stored routines with designation type singleton1.

diff --git a/test/etc/stratum.ini b/test/etc/stratum.ini
@@ -7,6 +7,6 @@ metadata = test/etc/routines.json
 
 [wrapper]
 parent_class  = SetBased\Stratum\SqlitePdo\SqlitePdoDataLayer
-mangler_class = SetBased\Stratum\NameMangler\PsrNameMangler
+mangler_class = SetBased\Stratum\Middle\NameMangler\PsrNameMangler
 wrapper_class = SetBased\Stratum\SqlitePdo\Test\TestDataLayer
 wrapper_file  = test/TestDataLayer.php