Migrate to plaisio/kernel 3.0.

prwater · prwater · commit 3f6e3eb9e896 · 2020-05-14T15:47:47.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@
 /bin/
 /composer.lock
 /doc/
-/test/C.php
 /test/TestDataLayer.php
 /test/coverage.xml
 /test/etc/columns.txt
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,15 +1,13 @@
 build:
-  dependencies:
-    before:
-      - cp test/C.txt test/C.php
-
   environment:
     mysql: 5.7
 
   tests:
+    before:
+      - export PLAISIO_CONFIG_DIR=test
+      - ./bin/phing kernel
     override:
       - command: './bin/phing unit'
         coverage:
           file:   'test/coverage.xml'
           format: 'php-clover'
-
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,6 @@ before_install:
 
 install:
   - composer self-update
-  - cp test/C.txt test/C.php
   - composer update
 
 script:
diff --git a/build.xml b/build.xml
@@ -4,16 +4,25 @@
         <exec command="composer update" checkreturn="true" passthru="true"/>
     </target>
 
+    <target name="kernel">
+        <exec executable="bin/plaisio" checkreturn="true" passthru="true">
+            <arg value="--ansi"/>
+            <arg value="plaisio:kernel-data-layer-type"/>
+        </exec>
+        <exec executable="bin/plaisio" checkreturn="true" passthru="true">
+            <arg value="--ansi"/>
+            <arg value="plaisio:kernel-properties"/>
+        </exec>
+    </target>
+
     <!-- Runs all unit tests -->
     <target name="unit">
-        <copy file="test/C.txt" tofile="test/C.php" haltonerror="false"/>
         <exec command="cat test/ddl/0010_create_database.sql      | mysql -v -u root"      passthru="true" checkreturn="true"/>
         <exec command="cat test/ddl/0020_create_user.sql          | mysql -v -u root"      passthru="true" checkreturn="true"/>
         <exec command="cat test/ddl/0300_abc_auth_company.sql     | mysql -v -u root test" passthru="true" checkreturn="true"/>
         <exec command="cat lib/ddl/0100_create_tables.sql         | mysql -v -u root test" passthru="true" checkreturn="true"/>
         <exec command="bin/stratum stratum test/etc/stratum.ini" passthru="true" checkreturn="true"/>
         <exec command="bin/phpunit" passthru="true" checkreturn="true"/>
-        <copy file="test/C.php" tofile="test/C.txt" haltonerror="true"/>
     </target>
     <target name="build"/>
 </project>
diff --git a/composer.json b/composer.json
@@ -8,14 +8,16 @@
   "license": "MIT",
   "require": {
     "php": ">=7.3",
-    "plaisio/blob-store": "^1.1",
-    "plaisio/kernel": "^2.0",
+    "plaisio/blob-store": "^1.2",
+    "plaisio/company-resolver": "^2.0",
+    "plaisio/kernel": "^3.0",
     "setbased/helper-program-execution": "^1.1"
   },
   "require-dev": {
     "phing/phing": "^2.0",
     "phpunit/phpunit": "^9.0",
-    "plaisio/company-resolver-uni": "^1.1",
+    "plaisio/company-resolver-uni": "^2.0",
+    "plaisio/console": "^2.0",
     "setbased/php-stratum": "^6.0",
     "setbased/php-stratum-mysql": "^5.0"
   },
diff --git a/lib/psql/abc_blob_store_blob/abc_blob_store_blob_del_blob.psql b/lib/psql/abc_blob_store_blob/abc_blob_store_blob_del_blob.psql
@@ -4,8 +4,8 @@
  * @param p_cmp_id The ID of the company (safeguard).
  * @param p_blb_id The ID of the BLOB.
  */
-create procedure abc_blob_del_blob( in p_cmp_id @abc_blob.cmp_id%type@,
-                                    in p_blb_id @abc_blob.blb_id%type@ )
+create procedure abc_blob_store_blob_del_blob(in p_cmp_id @abc_blob.cmp_id%type@,
+                                              in p_blb_id @abc_blob.blb_id%type@)
 modifies sql data
 -- type: none
 begin
diff --git a/lib/psql/abc_blob_store_blob/abc_blob_store_blob_get_blob.psql b/lib/psql/abc_blob_store_blob/abc_blob_store_blob_get_blob.psql
@@ -4,8 +4,8 @@
  * @param p_cmp_id The ID of the company (safeguard).
  * @param p_blb_id The ID of the BLOB.
  */
-create procedure abc_blob_get_blob( in p_cmp_id @abc_blob.cmp_id%type@,
-                                    in p_blb_id @abc_blob.blb_id%type@ )
+create procedure abc_blob_store_blob_get_blob(in p_cmp_id @abc_blob.cmp_id%type@,
+                                              in p_blb_id @abc_blob.blb_id%type@)
 reads sql data
 -- type: row1
 begin
diff --git a/lib/psql/abc_blob_store_blob/abc_blob_store_blob_get_metadata.psql b/lib/psql/abc_blob_store_blob/abc_blob_store_blob_get_metadata.psql
@@ -4,8 +4,8 @@
  * @param p_cmp_id The ID of the company (safeguard).
  * @param p_blb_id The ID of the BLOB.
  */
-create procedure abc_blob_get_metadata( in p_cmp_id @abc_blob.cmp_id%type@,
-                                        in p_blb_id @abc_blob.blb_id%type@ )
+create procedure abc_blob_store_blob_get_metadata(in p_cmp_id @abc_blob.cmp_id%type@,
+                                                  in p_blb_id @abc_blob.blb_id%type@)
 reads sql data
 -- type: row1
 begin
diff --git a/lib/psql/abc_blob_store_blob/abc_blob_store_blob_get_metadata_by_md5.psql b/lib/psql/abc_blob_store_blob/abc_blob_store_blob_get_metadata_by_md5.psql
@@ -4,8 +4,8 @@
  * @param p_cmp_id  The ID of the company (safeguard).
  * @param p_blb_md5 The MD5 hash.
  */
-create procedure abc_blob_get_metadata_by_md5(in p_cmp_id  @abc_blob.cmp_id%type@,
-                                              in p_blb_md5 varchar(32))
+create procedure abc_blob_store_blob_get_metadata_by_md5(in p_cmp_id  @abc_blob.cmp_id%type@,
+                                                         in p_blb_md5 varchar(32))
 reads sql data
 -- type: rows
 begin
diff --git a/lib/psql/abc_blob_store_blob/abc_blob_store_blob_insert_blob.psql b/lib/psql/abc_blob_store_blob/abc_blob_store_blob_insert_blob.psql
@@ -8,11 +8,11 @@
  * @param p_blb_timestamp The lats modification time of the BLOB. Defaults to now().
  * @param p_bdt_data      The actual BLOB.
  */
-create procedure abc_blob_insert_blob( in p_cmp_id        @abc_blob.cmp_id%type@,
-                                       in p_blb_filename  @abc_blob.blb_filename%type@,
-                                       in p_blb_mime_type @abc_blob.blb_mime_type%type@,
-                                       in p_blb_timestamp @abc_blob.blb_timestamp%type@,
-                                       in p_bdt_data      @abc_blob_data.bdt_data%type@ )
+create procedure abc_blob_store_blob_insert_blob(in p_cmp_id        @abc_blob.cmp_id%type@,
+                                                 in p_blb_filename  @abc_blob.blb_filename%type@,
+                                                 in p_blb_mime_type @abc_blob.blb_mime_type%type@,
+                                                 in p_blb_timestamp @abc_blob.blb_timestamp%type@,
+                                                 in p_bdt_data      @abc_blob_data.bdt_data%type@)
 modifies sql data
 -- type: none
 begin
@@ -90,6 +90,6 @@ begin
   ;
 
   -- select last_insert_id() blb_id;
-  -- Retrieve blb_id using abc_blob_workaround.
+  -- Retrieve blb_id using abc_blob_store_blob_workaround.
   set @blb_id = last_insert_id();
 end
diff --git a/lib/psql/abc_blob_store_blob/abc_blob_store_blob_workaround.psql b/lib/psql/abc_blob_store_blob/abc_blob_store_blob_workaround.psql
@@ -1,7 +1,7 @@
 /**
  * Work-a-round for bug with loop and BLOB in PHP for retrieving blb_id.
  */
-create procedure abc_blob_workaround()
+create procedure abc_blob_store_blob_workaround()
 modifies sql data
 -- type:   singleton1
 -- return: int
diff --git a/plaisio-database.xml b/plaisio-database.xml
@@ -0,0 +1,11 @@
+<database>
+    <provides>
+        <table>ABC_BLOB</table>
+    </provides>
+    <requires>
+        <table>ABC_AUTH_COMPANY</table>
+    </requires>
+    <scripts>
+        <script>lib/ddl/0100_create_tables.sql</script>
+    </scripts>
+</database>
diff --git a/plaisio-stratum.xml b/plaisio-stratum.xml
@@ -0,0 +1,5 @@
+<stratum>
+    <includes>
+        <include>lib/psql/**/*.psql</include>
+    </includes>
+</stratum>
diff --git a/plaisio.xml b/plaisio.xml
diff --git a/src/BlobBlobStore.php b/src/BlobBlobStore.php
@@ -3,13 +3,13 @@
 
 namespace Plaisio\BlobStore;
 
-use Plaisio\Kernel\Nub;
+use Plaisio\PlaisioObject;
 use SetBased\Helper\ProgramExecution;
 
 /**
  * Class for storing BLOBs (i.e. files, documents, images, data) as BLOBs in the database.
  */
-class BlobBlobStore implements BlobStore
+class BlobBlobStore extends PlaisioObject implements BlobStore
 {
   //--------------------------------------------------------------------------------------------------------------------
   /**
@@ -32,7 +32,7 @@ class BlobBlobStore implements BlobStore
    */
   public function delBlob(int $blbId): void
   {
-    Nub::$nub->DL->abcBlobDelBlob(Nub::$nub->companyResolver->getCmpId(), $blbId);
+    $this->nub->DL->abcBlobStoreBlobDelBlob($this->nub->company->cmpId, $blbId);
   }
 
   //--------------------------------------------------------------------------------------------------------------------
@@ -41,7 +41,7 @@ public function delBlob(int $blbId): void
    */
   public function getBlob(int $blbId): array
   {
-    return Nub::$nub->DL->abcBlobGetBlob(Nub::$nub->companyResolver->getCmpId(), $blbId);
+    return $this->nub->DL->abcBlobStoreBlobGetBlob($this->nub->company->cmpId, $blbId);
   }
 
   //--------------------------------------------------------------------------------------------------------------------
@@ -50,7 +50,7 @@ public function getBlob(int $blbId): array
    */
   public function getMetadata(int $blbId): array
   {
-    return Nub::$nub->DL->abcBlobGetMetadata(Nub::$nub->companyResolver->getCmpId(), $blbId);
+    return $this->nub->DL->abcBlobStoreBlobGetMetadata($this->nub->company->cmpId, $blbId);
   }
 
   //--------------------------------------------------------------------------------------------------------------------
@@ -100,9 +100,9 @@ public function putFile(string $path, string $filename, ?string $mimeType = null
 
     $data = file_get_contents($path);
 
-    Nub::$nub->DL->abcBlobInsertBlob(Nub::$nub->companyResolver->getCmpId(), $filename, $mimeType, $timestamp, $data);
+    $this->nub->DL->abcBlobStoreBlobInsertBlob($this->nub->company->cmpId, $filename, $mimeType, $timestamp, $data);
 
-    return Nub::$nub->DL->abcBlobWorkaround();
+    return $this->nub->DL->abcBlobStoreBlobWorkaround();
   }
 
   //--------------------------------------------------------------------------------------------------------------------
@@ -116,9 +116,9 @@ public function putString(string $data, string $filename, ?string $mimeType = nu
       $mimeType = $this->mimeTypeString($data);
     }
 
-    Nub::$nub->DL->abcBlobInsertBlob(Nub::$nub->companyResolver->getCmpId(), $filename, $mimeType, $timestamp, $data);
+    $this->nub->DL->abcBlobStoreBlobInsertBlob($this->nub->company->cmpId, $filename, $mimeType, $timestamp, $data);
 
-    return Nub::$nub->DL->abcBlobWorkaround();
+    return $this->nub->DL->abcBlobStoreBlobWorkaround();
   }
 
   //--------------------------------------------------------------------------------------------------------------------
@@ -127,7 +127,7 @@ public function putString(string $data, string $filename, ?string $mimeType = nu
    */
   public function searchByMd5(string $md5): array
   {
-    return Nub::$nub->DL->abcBlobGetMetadataByMd5(Nub::$nub->companyResolver->getCmpId(), $md5);
+    return $this->nub->DL->abcBlobStoreBlobGetMetadataByMd5($this->nub->company->cmpId, $md5);
   }
 }
 
diff --git a/test/BlobBlobStoreTest.php b/test/BlobBlobStoreTest.php
diff --git a/test/BlobBlobStoreTestCase.php b/test/BlobBlobStoreTestCase.php
diff --git a/test/C.php b/test/C.php
diff --git a/test/TestKernelPlaisio.php b/test/TestKernelPlaisio.php
diff --git a/test/TestKernelSys.php b/test/TestKernelSys.php
diff --git a/test/plaisio-stratum.xml b/test/plaisio-stratum.xml
