chore: apply PSR-12 manual fixes

common/cache/class.PartitionedCachable.php

@@ -173,6 +173,8 @@ public function __wakeup()
      * @access public
      * @author Jerome Bogaerts, <[email protected]>
      * @return mixed
+     *
+     * phpcs:disable PSR2.Methods.MethodDeclaration
      */
     public function _remove()
     {
@@ -183,6 +185,7 @@ public function _remove()
             $this->getCache()->remove($this->getSerial());
         }
     }
+    // phpcs:enable PSR2.Methods.MethodDeclaration
 
     /**
      * Short description of method getSuccessors
@@ -263,4 +266,4 @@ abstract protected function buildSerial();
      * @return common_cache_Cache
      */
     abstract public function getCache();
-} /* end of abstract class common_cache_PartitionedCachable */
+}

common/cache/class.SingletonCache.php

@@ -113,4 +113,4 @@ public static function getCached($function)
     private function __construct()
     {
     }
-} /* end of abstract class common_cache_SingletonCache */
+}

common/configuration/class.BoundableComponent.php

@@ -152,4 +152,4 @@ public function getMax()
      * @return string
      */
     abstract public function getValue();
-} /* end of abstract class common_configuration_BoundableComponent */
+}

common/configuration/class.Component.php

@@ -144,4 +144,4 @@ public function setName($name)
 
         $this->name = $name;
     }
-} /* end of abstract class common_configuration_Component */
+}

common/ext/class.AbstractExtension.php

@@ -81,4 +81,4 @@ public function getRequiredExtensions()
     public function getVersion()
     {
     }
-} /* end of abstract class common_ext_AbstractExtension */
+}

common/interface.Serializable.php

@@ -41,4 +41,4 @@ interface common_Serializable
      * @return string
      */
     public function getSerial();
-} /* end of interface common_Serializable */
+}

common/legacy/class.LegacyAutoLoader.php

@@ -185,4 +185,6 @@ private function wrapClass($legacyClass, $realClass)
     }
 }
 
+// phpcs:disable PSR1.Files.SideEffects
 common_legacy_LegacyAutoLoader::register();
+// phpcs:enable PSR1.Files.SideEffects

common/log/interface.Appender.php

@@ -62,4 +62,4 @@ public function getLogThreshold();
      * @return boolean
      */
     public function init($configuration);
-} /* end of interface common_log_Appender */
+}

common/log/interface.SeverityLevel.php

@@ -40,4 +40,4 @@ interface common_log_SeverityLevel
      * @return int
      */
     public function getSeverity();
-} /* end of interface common_log_SeverityLevel */
+}

common/oatbox/service/ServiceFactoryInterface.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,6 +19,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace oat\oatbox\service;
 
 use Zend\ServiceManager\ServiceLocatorInterface;

common/persistence/class.Persistence.php

@@ -60,12 +60,15 @@ public static function getPersistence($driverId)
      * @author "Lionel Lecaque, <[email protected]>"
      * @param array $params
      * @param common_persistence_driver $driver
+     *
+     * phpcs:disable PEAR.Functions.ValidDefaultValue
      */
     public function __construct($params = [], common_persistence_driver $driver)
     {
         $this->setParams($params);
         $this->setDriver($driver);
     }
+    // phpcs:enable PEAR.Functions.ValidDefaultValue
 
     /**
      * Retrieve persistence's driver

common/uri/class.AbstractUriProvider.php

@@ -96,4 +96,4 @@ public function __construct($driver)
 
         $this->setDriver($driver);
     }
-} /* end of abstract class common_uri_AbstractUriProvider */
+}

config/default/SimpleCache.conf.php

@@ -1,11 +1,11 @@
 <?php
 
-use oat\oatbox\cache\KeyValueCache;
-
 /**
  * The default cache implementation
  */
 
+use oat\oatbox\cache\KeyValueCache;
+
 return new KeyValueCache([
     KeyValueCache::OPTION_PERSISTENCE => 'cache'
 ]);

config/default/session.conf.php

@@ -1,9 +1,9 @@
 <?php
 
-use oat\oatbox\session\SessionService;
-
 /**
  * Session config
  */
 
+use oat\oatbox\session\SessionService;
+
 return new SessionService();

config/default/uriProvider.conf.php

@@ -1,13 +1,13 @@
 <?php
 
-use oat\generis\model\kernel\uri\Bin2HexUriProvider;
-
 /**
  * Default config header
  *
  * To replace this add a file generis/conf/header/uriProvider.conf.php
  */
 
+use oat\generis\model\kernel\uri\Bin2HexUriProvider;
+
 return new Bin2HexUriProvider([
     Bin2HexUriProvider::OPTION_NAMESPACE => LOCAL_NAMESPACE . '#'
 ]);

core/kernel/api/interface.Api.php

@@ -55,4 +55,4 @@ public function logIn($login, $password, $module, $role);
      * @return boolean
      */
     public function logOut();
-} /* end of interface core_kernel_api_Api */
+}

core/kernel/classes/class.DbWrapper.php

@@ -21,7 +21,9 @@
  *
  */
 
+// phpcs:disable PSR1.Files.SideEffects
 error_reporting(E_ALL);
+// phpcs:enable PSR1.Files.SideEffects
 
 
 /**

core/kernel/impl/class.ApiModelOO.php

@@ -29,7 +29,9 @@
 use oat\oatbox\service\ServiceManager;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
+// phpcs:disable PSR1.Files.SideEffects
 error_reporting(E_ALL);
+// phpcs:enable PSR1.Files.SideEffects
 
 /**
  * Generis Object Oriented API - core\kernel\impl\class.ApiModelOO.php

core/kernel/persistence/interface.PropertyInterface.php

@@ -108,4 +108,4 @@ public function setMultiple(core_kernel_classes_Resource $resource, $isMultiple)
      * @return void
      */
     public function setLgDependent(core_kernel_classes_Resource $resource, $isLgDependent);
-} /* end of interface core_kernel_persistence_PropertyInterface */
+}

core/kernel/persistence/newsql/NewSqlRdf.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,6 +20,8 @@
  * @license GPLv2
  */
 
+declare(strict_types=1);
+
 namespace oat\generis\model\kernel\persistence\newsql;
 
 use core_kernel_classes_Triple;

core/kernel/persistence/smoothsql/class.SmoothRdf.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,6 +19,8 @@
  *
  */
 
+declare(strict_types=1);
+
 use Doctrine\DBAL\ParameterType;
 use oat\generis\model\data\Ontology;
 use oat\generis\model\data\RdfInterface;

core/kernel/rules/class.Expression.php

@@ -216,12 +216,10 @@ public function expEval($variable = [])
             ) {
                 common_Logger::d('Both Part are Container', ['Generis Expression']);
                 $returnValue = $this->operatorEval($firstPart, $secondPart);
-            }
-
-            //both are vector
-            elseif (
+            } elseif (
+                //both are vector
                 $firstPart instanceof core_kernel_classes_ContainerCollection
-                    && $secondPart instanceof core_kernel_classes_ContainerCollection
+                && $secondPart instanceof core_kernel_classes_ContainerCollection
             ) {
                 $returnValue = false;
                 foreach ($firstPart->getIterator() as $subLeftPart) {
@@ -240,11 +238,10 @@ public function expEval($variable = [])
             //die("the evaluation is ". $returnValue);
 
             //throw new common_Exception('not implemented yet', __FILE__,__LINE__);
-            }
-            // first is a vector second is a value
-            elseif (
-                ($firstPart instanceof core_kernel_classes_ContainerCollection)
-                    && ($secondPart instanceof core_kernel_classes_Container)
+            } elseif (
+                // first is a vector second is a value
+                $firstPart instanceof core_kernel_classes_ContainerCollection
+                && $secondPart instanceof core_kernel_classes_Container
             ) {
                 $tempResult = false;
                 foreach ($firstPart->getIterator() as $container) {
@@ -265,11 +262,10 @@ public function expEval($variable = [])
                     }
                 }
                 $returnValue = $tempResult;
-            }
-            // first is a value second is a vector
-            elseif (
-                ($firstPart instanceof core_kernel_classes_Container)
-                    && ($secondPart instanceof core_kernel_classes_ContainerCollection)
+            } elseif (
+                // first is a value second is a vector
+                $firstPart instanceof core_kernel_classes_Container
+                && $secondPart instanceof core_kernel_classes_ContainerCollection
             ) {
                 foreach ($secondPart->getIterator() as $container) {
                     common_Logger::d('FirstPart Part Container is  Second is ContainerCollection', ['Generis Expression']);
@@ -279,9 +275,7 @@ public function expEval($variable = [])
                     $tempResult = $tempResult && $this->operatorEval($firstPart, $container);
                 }
                 $returnValue = $tempResult;
-            }
-            //case we compare boolean
-            else {
+            } else { //case we compare boolean
                 common_Logger::d('Both part are boolean', ['Generis Expression']);
 
                 switch ($this->getLogicalOperator()->getUri()) {

core/kernel/users/interface.UsersManagement.php

@@ -179,4 +179,4 @@ public function getAllowedRoles();
          * @return core_kernel_classes_Resource
         */
     public function getDefaultRole();
-} /* end of interface core_kernel_users_UsersManagement */
+}

test/bootstrap.php

@@ -20,6 +20,8 @@
  * @license    GPLv2
  * @package    package_name
  * @subpackage
+ *
+ * phpcs:disable PSR1.Files.SideEffects
  */
 
 $extensionRoot = realpath(__DIR__ . '/../');

test/integration/mutex/test_action.php

@@ -1,5 +1,7 @@
 <?php
 
+// phpcs:disable PSR1.Files.SideEffects
+
 require_once __DIR__ . '/../../../common/inc.extension.php';
 
 use oat\oatbox\mutex\LockService;

test/integration/rules/ExpressionFactoryTest.php

@@ -20,7 +20,9 @@
  *               2017 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  */
 
+// phpcs:disable PSR1.Files.SideEffects
 error_reporting(E_ALL);
+// phpcs:enable PSR1.Files.SideEffects
 
 use oat\generis\model\RulesRdf;
 use oat\generis\test\GenerisPhpUnitTestRunner;

test/integration/rules/ExpressionTest.php

@@ -1,7 +1,5 @@
 <?php
 
-use oat\generis\model\RulesRdf;
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,6 +22,7 @@
  */
 
 use oat\generis\test\TestCase;
+use oat\generis\model\RulesRdf;
 
 class ExpressionTest extends TestCase
 {

test/integration/rules/OperationFactoryTest.php

@@ -20,7 +20,9 @@
  *               2017 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  */
 
+// phpcs:disable PSR1.Files.SideEffects
 error_reporting(E_ALL);
+// phpcs:enable PSR1.Files.SideEffects
 
 use oat\generis\model\RulesRdf;
 use oat\generis\test\GenerisPhpUnitTestRunner;

test/integration/rules/OperationTest.php

@@ -20,7 +20,9 @@
  *               2017 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  */
 
+// phpcs:disable PSR1.Files.SideEffects
 error_reporting(E_ALL);
+// phpcs:enable PSR1.Files.SideEffects
 
 use oat\generis\model\RulesRdf;
 use oat\generis\test\GenerisPhpUnitTestRunner;

test/integration/rules/TermFactoryTest.php

@@ -20,7 +20,9 @@
  *               2017 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  */
 
+// phpcs:disable PSR1.Files.SideEffects
 error_reporting(E_ALL);
+// phpcs:enable PSR1.Files.SideEffects
 
 use oat\generis\model\GenerisRdf;
 use oat\generis\model\OntologyRdfs;

test/integration/rules/TermTest.php

@@ -19,7 +19,10 @@
  *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
  *               2017 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  */
+
+// phpcs:disable PSR1.Files.SideEffects
 error_reporting(E_ALL);
+// phpcs:enable PSR1.Files.SideEffects
 
 use oat\generis\model\GenerisRdf;
 use oat\generis\model\OntologyRdfs;

test/samples/manifests/complexManifest.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,8 +19,6 @@
  *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
  *
  */
-?>
-<?php
 
 /**
  * @author CRP Henri Tudor - TAO Team - {@link http://www.tao.lu}

test/samples/manifests/lightweightManifest.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,8 +19,6 @@
  *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
  *
  */
-?>
-<?php
 
 /**
  * This lightweight manifest is based on the TAO filemanager one.