Pu/pm/rector80to85

.github/workflows/php-unit-test.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-24.04]
-        php-versions: ['8.0', '8.1', '8.2']
+        php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
 
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
     steps:

.rector.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\CodeQuality\Rector as CodeQuality;
+use Rector\Set\ValueObject\LevelSetList;
+use Rector\ValueObject\PhpVersion;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__ . '/lib',
+    ])
+    ->withRules([
+        CodeQuality\Class_\CompleteDynamicPropertiesRector::class
+    ])
+    ->withSets([
+        LevelSetList::UP_TO_PHP_85
+    ])
+    ->withPhpVersion(PhpVersion::PHP_80);

composer.json

@@ -12,13 +12,14 @@
         "url": "https://github.com/tine20/zendframework1.git"
     }],
     "require": {
-        "php": ">=7.4.0",
+        "php": ">=8.0",
         "ext-ctype": "*",
         "zendframework/zendframework1": "1.12.20.*"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5",
-        "phing/phing": "2.6.1-p0"
+        "phing/phing": "2.6.1-p0",
+        "rector/rector": "^2.3"
     },
     "autoload": {
         "psr-0": {
@@ -33,6 +34,8 @@
     },
     "scripts": {
         "php8test": "cd tests/docker; docker-compose run cli8 ash -c 'cd /src/tests; ../vendor/bin/phpunit --color Syncroton/AllTests.php'; cd ../..;",
-        "php81test": "cd tests/docker; docker-compose run cli81 ash -c 'cd /src/tests; ../vendor/bin/phpunit --color Syncroton/AllTests.php'; cd ../..;"
+        "php81test": "cd tests/docker; docker-compose run cli81 ash -c 'cd /src/tests; ../vendor/bin/phpunit --color Syncroton/AllTests.php'; cd ../..;",
+        "rector:test": "vendor/bin/rector process --config .rector.php --dry-run",
+        "rector:fix": "vendor/bin/rector process --config .rector.php"
     }
 }

lib/Syncroton/Backend/ABackend.php

@@ -24,8 +24,6 @@ abstract class Syncroton_Backend_ABackend implements Syncroton_Backend_IBackend
      */
     protected $_db;
 
-    protected $_tablePrefix;
-
     protected $_tableName;
 
     protected $_modelClassName;
@@ -38,10 +36,9 @@ abstract class Syncroton_Backend_ABackend implements Syncroton_Backend_IBackend
      * @param  Zend_Db_Adapter_Abstract  $_db
      * @param  string                    $_tablePrefix
      */
-    public function __construct(Zend_Db_Adapter_Abstract $_db, $_tablePrefix = 'Syncroton_')
+    public function __construct(Zend_Db_Adapter_Abstract $_db, protected $_tablePrefix = 'Syncroton_')
     {
         $this->_db          = $_db;
-        $this->_tablePrefix = $_tablePrefix;
     }
 
     /**
@@ -73,7 +70,7 @@ public function create($model)
      */
     protected function _convertModelToArray($model)
     {
-        $data = array();
+        $data = [];
 
         foreach ($model as $key => $value) {
             if ($value instanceof DateTime) {
@@ -145,7 +142,7 @@ public function delete($id)
     {
         $id = $id instanceof $this->_modelInterfaceName ? $id->id : $id;
 
-        $result = $this->_db->delete($this->_tablePrefix . $this->_tableName, array('id = ?' => $id));
+        $result = $this->_db->delete($this->_tablePrefix . $this->_tableName, ['id = ?' => $id]);
 
         return (bool) $result;
     }
@@ -162,9 +159,9 @@ public function update($model)
 
         $data = $this->_convertModelToArray($model);
 
-        $this->_db->update($this->_tablePrefix . $this->_tableName, $data, array(
+        $this->_db->update($this->_tablePrefix . $this->_tableName, $data, [
             'id = ?' => $model->id
-        ));
+        ]);
 
         return $this->get($model->id);
     }
@@ -178,7 +175,7 @@ public function update($model)
      */
     public function userAccounts($device)
     {
-        return array();
+        return [];
     }
 
     /**
@@ -190,7 +187,7 @@ protected function _fromCamelCase($string)
     {
         $string = lcfirst($string);
 
-        return preg_replace_callback('/([A-Z])/', function ($string) {return '_' . strtolower($string[0]);}, $string);
+        return preg_replace_callback('/([A-Z])/', fn($string) => '_' . strtolower($string[0]), $string);
     }
 
     /**
@@ -206,6 +203,6 @@ protected function _toCamelCase($string, $ucFirst = true)
             $string = ucfirst($string);
         }
 
-        return preg_replace_callback('/_([a-z])/', function ($string) {return strtoupper($string[1]);}, $string);
+        return preg_replace_callback('/_([a-z])/', fn($string) => strtoupper($string[1]), $string);
     }
 }

lib/Syncroton/Backend/Content.php

@@ -34,11 +34,11 @@ public function delete($id)
     {
         $id = $id instanceof $this->_modelInterfaceName ? $id->id : $id;
 
-        $this->_db->update($this->_tablePrefix . 'content', array(
+        $this->_db->update($this->_tablePrefix . 'content', [
             'is_deleted' => 1
-        ), array(
+        ], [
             'id = ?' => $id
-        ));
+        ]);
 
     }
 
@@ -106,10 +106,10 @@ public function resetState($deviceId, $folderId)
         $deviceId = $deviceId instanceof Syncroton_Model_IDevice ? $deviceId->id : $deviceId;
         $folderId = $folderId instanceof Syncroton_Model_IFolder ? $folderId->id : $folderId;
 
-        $where = array(
+        $where = [
             $this->_db->quoteInto($this->_db->quoteIdentifier('device_id') . ' = ?', $deviceId),
             $this->_db->quoteInto($this->_db->quoteIdentifier('folder_id') . ' = ?', $folderId)
-        );
+        ];
 
         $this->_db->delete($this->_tablePrefix . 'content', $where);
     }

lib/Syncroton/Backend/Device.php

@@ -64,7 +64,7 @@ public function getUserDevice($ownerId, $deviceId)
      */
     public function userAccounts($device)
     {
-        return array();
+        return [];
     }
 
     /**