From 6c282e5373db3c10171636c7a7c2f76902bd3132 Mon Sep 17 00:00:00 2001
From: Andrei Shapiro <shpr.andrew@gmail.com>
Date: Wed, 3 May 2023 21:48:49 +0000
Subject: [PATCH 1/2] chore: apply PSR-12

---
 actions/class.ItemExport.php                  |  7 +++--
 actions/class.ItemRunner.php                  | 12 +++----
 actions/class.Main.php                        |  2 +-
 actions/class.RestFormItem.php                |  2 +-
 actions/class.RestItems.php                   |  3 +-
 actions/class.SaSItems.php                    |  1 -
 actions/form/class.Item.php                   |  6 ++--
 actions/form/class.RestItemForm.php           |  4 +--
 helpers/class.Deployment.php                  | 18 +++++------
 helpers/class.Xhtml.php                       | 31 ++++++++++---------
 helpers/class.Xslt.php                        |  7 +++--
 includes/constants.php                        |  2 +-
 includes/raw_start.php                        |  2 ++
 .../Version202012161236262141_taoItems.php    |  1 -
 models/classes/CategoryService.php            |  6 ++--
 .../classes/Import/class.ExtractException.php |  2 +-
 .../classes/Import/class.ImportException.php  |  2 +-
 .../classes/Import/class.ParsingException.php |  2 +-
 models/classes/ItemCompilerIndex.php          |  1 -
 models/classes/ItemModelStatus.php            | 10 +++---
 .../classes/PreviewClientConfigRegistry.php   |  3 +-
 models/classes/asset/Loader.php               |  9 +++---
 .../class.CompilationFailedException.php      |  2 +-
 models/classes/class.CrudItemsService.php     | 12 +++----
 models/classes/class.ItemCompiler.php         | 17 +++++-----
 models/classes/class.ItemExporter.php         | 23 ++++++--------
 models/classes/class.ItemModelException.php   |  2 +-
 models/classes/class.TemplateRenderer.php     | 27 ++++++++--------
 .../classes/event/ItemContentClonedEvent.php  |  1 -
 models/classes/event/ItemCreatedEvent.php     |  1 -
 models/classes/event/ItemDuplicatedEvent.php  |  1 -
 models/classes/event/ItemExportEvent.php      |  1 -
 models/classes/event/ItemImportEvent.php      |  1 -
 models/classes/event/ItemRdfUpdatedEvent.php  |  1 -
 models/classes/event/ItemRemovedEvent.php     |  1 -
 models/classes/event/ItemUpdatedEvent.php     |  5 ++-
 .../exporter/class.DefaultItemExporter.php    |  2 +-
 .../classes/interface.ExportableItemModel.php |  2 +-
 .../classes/interface.ImportableItemModel.php |  1 +
 models/classes/interface.itemModel.php        |  7 +++--
 models/classes/media/ItemMediaResolver.php    |  1 -
 models/classes/media/LocalItemSource.php      |  7 ++---
 models/classes/ontology/ItemAuthorRole.php    |  2 +-
 models/classes/pack/ExceptionMissingAsset.php |  1 -
 .../classes/pack/ExceptionMissingEncoder.php  |  1 -
 models/classes/pack/ItemPacker.php            |  5 ++-
 models/classes/pack/Packer.php                | 10 +++---
 .../pack/encoders/Base64fileEncoder.php       |  2 +-
 .../classes/preview/ItemPreviewerService.php  |  2 +-
 .../preview/OntologyItemNotFoundException.php |  1 -
 .../classes/render/ItemAssetsReplacement.php  |  3 +-
 models/classes/render/NoneItemReplacement.php |  2 --
 .../search/class.XmlItemContentTokenizer.php  |  8 ++---
 scripts/update/class.Updater.php              |  3 +-
 test/integration/XhtmlTest.php                | 11 +++----
 test/integration/pack/PackerTest.php          |  3 +-
 test/integration/taoApiServer.php             |  2 +-
 test/unit/XmlItemContentTokenizerTest.php     |  4 +--
 test/unit/models/classes/ItemsServiceTest.php |  2 +-
 test/unit/pack/ItemPackTest.php               |  4 +--
 test/unit/pack/encoder/Base64EncoderTest.php  |  1 +
 .../pack/encoder/Base64fileEncoderTest.php    |  1 +
 test/unit/pack/encoder/NoneEncoderTest.php    |  2 +-
 .../unit/preview/ItemPreviewerServiceTest.php |  1 -
 test/unit/render/NoneItemReplacementTest.php  |  1 -
 65 files changed, 152 insertions(+), 168 deletions(-)

diff --git a/actions/class.ItemExport.php b/actions/class.ItemExport.php
index ef9bbbb50..a791d54d9 100644
--- a/actions/class.ItemExport.php
+++ b/actions/class.ItemExport.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
@@ -59,10 +60,12 @@ protected function getAvailableExportHandlers(): array
 
         $instances = $this->getClassInstances();
         if (!count($instances)) {
-            $returnValue = array_filter($returnValue,
+            $returnValue = array_filter(
+                $returnValue,
                 static function (tao_models_classes_export_ExportHandler $handler) {
                     return $handler instanceof tao_models_classes_export_RdfExporter;
-                });
+                }
+            );
         }
 
 
diff --git a/actions/class.ItemRunner.php b/actions/class.ItemRunner.php
index 6cc6da4bb..c2529b257 100755
--- a/actions/class.ItemRunner.php
+++ b/actions/class.ItemRunner.php
@@ -39,12 +39,12 @@ public function index()
         $lang = $this->getSession()->getDataLanguage();
 
         if ($this->hasRequestParameter('serviceCallId')) {
-                    $serviceCallId = $this->getRequestParameter('serviceCallId');
-                    $variableData = $this->getServiceLocator()->get(StateStorage::SERVICE_ID)->get($userId, $serviceCallId);
-                    $this->setData('storageData', [
-                            'serial'    => $serviceCallId,
-                            'data'      => is_null($variableData) ? [] : $variableData
-                    ]);
+            $serviceCallId = $this->getRequestParameter('serviceCallId');
+            $variableData = $this->getServiceLocator()->get(StateStorage::SERVICE_ID)->get($userId, $serviceCallId);
+            $this->setData('storageData', [
+                    'serial'    => $serviceCallId,
+                    'data'      => is_null($variableData) ? [] : $variableData
+            ]);
         }
 
         $directory = $this->getDirectory($this->getRequestParameter('itemPath'));
diff --git a/actions/class.Main.php b/actions/class.Main.php
index f258ba32d..9682a6756 100644
--- a/actions/class.Main.php
+++ b/actions/class.Main.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
@@ -30,5 +31,4 @@
 
 class taoItems_actions_Main extends tao_actions_Main
 {
-
 }
diff --git a/actions/class.RestFormItem.php b/actions/class.RestFormItem.php
index 114a09e45..63d626604 100644
--- a/actions/class.RestFormItem.php
+++ b/actions/class.RestFormItem.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
@@ -24,7 +25,6 @@
  */
 class taoItems_actions_RestFormItem extends \tao_actions_RestResource
 {
-
     /**
      * Create only authorize for GET requests by now
      * @throws \common_exception_Unauthorized
diff --git a/actions/class.RestItems.php b/actions/class.RestItems.php
index 0d3e20c8d..b0e78403b 100644
--- a/actions/class.RestItems.php
+++ b/actions/class.RestItems.php
@@ -17,7 +17,7 @@
  *
  */
 
-use \oat\tao\model\routing\AnnotationReader\security;
+use oat\tao\model\routing\AnnotationReader\security;
 
 /**
  *
@@ -25,7 +25,6 @@
  */
 class taoItems_actions_RestItems extends tao_actions_CommonRestModule
 {
-
     /**
      * taoItems_actions_RestItems constructor.
      * @security("hide")
diff --git a/actions/class.SaSItems.php b/actions/class.SaSItems.php
index fbd58f30d..9418c85f7 100644
--- a/actions/class.SaSItems.php
+++ b/actions/class.SaSItems.php
@@ -34,7 +34,6 @@
  */
 class taoItems_actions_SaSItems extends taoItems_actions_Items
 {
-
     /**
      * overrided to prevent exception:
      * if no class is selected, the root class is returned
diff --git a/actions/form/class.Item.php b/actions/form/class.Item.php
index 2866d6881..ed34bde80 100644
--- a/actions/form/class.Item.php
+++ b/actions/form/class.Item.php
@@ -39,12 +39,12 @@ class taoItems_actions_form_Item extends tao_actions_form_Instance
     protected function initElements()
     {
         parent::initElements();
-        
+
         $elementId = tao_helpers_Uri::encode(taoItems_models_classes_ItemsService::PROPERTY_ITEM_MODEL);
         $ele = $this->form->getElement($elementId);
         $ele->feed();
         $modelUri = $ele->getEvaluatedValue();
-        
+
         if (empty($modelUri)) {
             // remove deprecated models
             $statusProperty = new core_kernel_classes_Property(ItemModelStatus::CLASS_URI);
@@ -67,7 +67,7 @@ protected function initElements()
             $itemModelElt = tao_helpers_form_FormFactory::getElement($elementId, 'Hidden');
             $itemModelElt->setValue($modelUri);
             $this->form->addElement($itemModelElt, true);
-            
+
             // display model label
             $model = new core_kernel_classes_Resource($modelUri);
             $itemModelLabelElt = tao_helpers_form_FormFactory::getElement('itemModelLabel', 'Label');
diff --git a/actions/form/class.RestItemForm.php b/actions/form/class.RestItemForm.php
index 3d32fce99..bb00b0b6d 100644
--- a/actions/form/class.RestItemForm.php
+++ b/actions/form/class.RestItemForm.php
@@ -19,8 +19,8 @@
  *
  */
 
-use \Zend\ServiceManager\ServiceLocatorAwareTrait;
-use \Zend\ServiceManager\ServiceLocatorAwareInterface;
+use Zend\ServiceManager\ServiceLocatorAwareTrait;
+use Zend\ServiceManager\ServiceLocatorAwareInterface;
 
 /**
  * Class tao_actions_form_RestItemForm
diff --git a/helpers/class.Deployment.php b/helpers/class.Deployment.php
index b6fc06023..43fc38dd7 100755
--- a/helpers/class.Deployment.php
+++ b/helpers/class.Deployment.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
@@ -30,7 +31,6 @@
  */
 class taoItems_helpers_Deployment
 {
-
     private static $defaultMedia = ["jpg", "jpeg", "png", "gif", "mp3", 'mp4', 'webm', 'swf', 'wma', 'wav', 'css', 'js'];
 
     /**
@@ -66,7 +66,7 @@ public static function copyResources($sourceDirectory, $destinationDirectory, $e
      */
     public static function retrieveExternalResources($xhtml, $destination)
     {
-        
+
         if (!file_exists($destination)) {
             if (!mkdir($destination)) {
                 common_Logger::e('Folder ' . $destination . ' could not be created');
@@ -87,7 +87,7 @@ public static function retrieveExternalResources($xhtml, $destination)
         $uniqueMediaList = array_unique($mediaList[0]);
 
         $report = new common_report_Report(common_report_Report::TYPE_SUCCESS, __('Retrieving external resources'));
-        
+
         foreach ($uniqueMediaList as $mediaUrl) {
             // This is a file that has to be stored in the item compilation folder itself...
             // I do not get why they are all copied. They are all there they were copied from the item module...
@@ -95,9 +95,9 @@ public static function retrieveExternalResources($xhtml, $destination)
             // So if the URL does not matches a place where the TAO server is, we curl the resource and store it.
             // FileManager files should be considered as remote resources to avoid 404 issues. Indeed, a backoffice
             // user might delete an image in the filemanager during a delivery campain. This is dangerous.
-            
+
             $decodedMediaUrl = str_replace('\/', '/', $mediaUrl);
-            
+
             $mediaPath = self::retrieveFile($decodedMediaUrl, $destination);
             if (!empty($mediaPath) && $mediaPath !== false) {
                 $xhtml = str_replace($mediaUrl, basename($mediaPath), $xhtml, $replaced); //replace only when copyFile is successful
@@ -146,19 +146,19 @@ public static function retrieveFile($url, $destination)
             if (USE_HTTP_AUTH) {
                 $addAuth = false;
                 $domains = ['localhost', '127.0.0.1', ROOT_URL];
-                
+
                 foreach ($domains as $domain) {
                     if (preg_match("/" . preg_quote($domain, '/') . "/", $url)) {
                         $addAuth = true;
                     }
                 }
-                
+
                 if ($addAuth) {
                     curl_setopt($curlHandler, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
                     curl_setopt($curlHandler, CURLOPT_USERPWD, USE_HTTP_USER . ":" . USE_HTTP_PASS);
                 }
             }
-            
+
             curl_exec($curlHandler);
             $httpCode = curl_getinfo($curlHandler, CURLINFO_HTTP_CODE);
             $success = $httpCode == 200;
@@ -170,7 +170,7 @@ public static function retrieveFile($url, $destination)
             common_Logger::d('Copying ' . $path);
             $success = helpers_File::copy($path, $destination . $fileName);
         }
-        
+
         if ($success == false) {
             common_Logger::w('Unable to retrieve ' . $url);
             return false;
diff --git a/helpers/class.Xhtml.php b/helpers/class.Xhtml.php
index ba0c41789..c425a0baa 100644
--- a/helpers/class.Xhtml.php
+++ b/helpers/class.Xhtml.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
@@ -19,7 +20,7 @@
  *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
  *
  */
- 
+
 /**
  * This helper class aims at providing utility methods to deal
  * with XHTML documents.
@@ -43,7 +44,7 @@ public static function hasScriptElements(DOMDocument $dom, $pattern)
     {
         return count(self::getScriptElements($dom, $pattern)) > 0;
     }
-    
+
     /**
      * Retrieve <script> elements in the given DOMDocument where the src attribute value
      * matches a PCRE pattern.
@@ -59,27 +60,27 @@ public static function getScriptElements(DOMDocument $dom, $pattern)
         $xpath = new DOMXPath($dom);
         $elements = [];
         $scan = $xpath->query('/html/head/script');
-        
+
         for ($i = 0; $i < $scan->length; $i++) {
             $e = $scan->item($i);
-            
+
             if ($e->hasAttribute('src')) {
                 $src = $e->getAttribute('src');
                 $pathinfo = pathinfo($src);
-                
+
                 if (!empty($pathinfo['basename'])) {
                     $filename = $pathinfo['basename'];
-                    
+
                     if (preg_match($pattern, $filename) === 1) {
                         $elements[] = $e;
                     }
                 }
             }
         }
-        
+
         return $elements;
     }
-    
+
     /**
      * Remove <script> elements in a DOMDocument that have an src attribute value
      * that matches a given PCRE pattern.
@@ -93,17 +94,17 @@ public static function getScriptElements(DOMDocument $dom, $pattern)
     public static function removeScriptElements(DOMDocument $dom, $pattern)
     {
         $removed = 0;
-        
+
         foreach (self::getScriptElements($dom, $pattern) as $e) {
             if (!empty($e->parentNode)) {
                 $e->parentNode->removeChild($e);
                 $removed++;
             }
         }
-        
+
         return $removed;
     }
-    
+
     /**
      * Add a <script> element in the <head> element of a DOMDocument.
      *
@@ -116,21 +117,21 @@ public static function addScriptElement(DOMDocument $dom, $src, $append = true,
     {
         $xpath = new DOMXPath($dom);
         $scan = $xpath->query('/html/head');
-        
+
         $newNode = $dom->createElement('script');
         $newNode->setAttribute('type', $type);
         $newNode->setAttribute('src', $src);
-        
+
         for ($i = 0; $i < $scan->length; $i++) {
             $head = $scan->item($i);
-            
+
             if ($append == true || $xpath->query('//script', $head)->length == 0) {
                 $head->appendChild($newNode);
             } else {
                 $refNode = $xpath->query('//script', $head)->item(0);
                 $head->insertBefore($newNode, $refNode);
             }
-            
+
             break;
         }
     }
diff --git a/helpers/class.Xslt.php b/helpers/class.Xslt.php
index 67a206114..7691f19bd 100644
--- a/helpers/class.Xslt.php
+++ b/helpers/class.Xslt.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
@@ -30,10 +31,10 @@
 class taoItems_helpers_Xslt
 {
     // namespace for the set parameters function
-    const PARAMS_NS = '';
+    public const PARAMS_NS = '';
     // xlst namespace short and full
-    const XSLT_NS = 'http://www.w3.org/1999/XSL/Transform';
-    const XSLT_SHORT_NS = 'xsl';
+    public const XSLT_NS = 'http://www.w3.org/1999/XSL/Transform';
+    public const XSLT_SHORT_NS = 'xsl';
 
     /**
      *  Transform the given xml with the given stylesheet adding params if necessary
diff --git a/includes/constants.php b/includes/constants.php
index b3e67c104..d18472cec 100755
--- a/includes/constants.php
+++ b/includes/constants.php
@@ -44,7 +44,7 @@
     'PROPERTY_ITEM_MODEL_SERVICE'       => 'http://www.tao.lu/Ontologies/TAOItem.rdf#ModelService',
 // not used
     'TAO_ITEM_SOURCENAME_PROPERTY'      => 'http://www.tao.lu/Ontologies/TAOItem.rdf#ItemContentSourceName',
-  
+
     'TAO_ITEM_MODEL_STATUS_PROPERTY'        => 'http://www.tao.lu/Ontologies/TAOItem.rdf#ItemModelStatus',
 //  not used
     'TAO_ITEM_MODEL_STATUS_STABLE'          => 'http://www.tao.lu/Ontologies/TAOItem.rdf#StatusStable',
diff --git a/includes/raw_start.php b/includes/raw_start.php
index e02003028..2cf9a3166 100644
--- a/includes/raw_start.php
+++ b/includes/raw_start.php
@@ -21,12 +21,14 @@
  */
 ?>
 <?php
+
 /**
  * RAW Bootstraping
  *
  * @author CRP Henri Tudor - TAO Team - {@link http://www.tao.lu}
  * @license GPLv2  http://www.opensource.org/licenses/gpl-2.0.php
  */
+
 if (PHP_SAPI == 'cli') {
     $_SERVER['HTTP_HOST'] = 'http://localhost';
     $_SERVER['DOCUMENT_ROOT'] = dirname(__FILE__) . '/../../..';
diff --git a/migrations/Version202012161236262141_taoItems.php b/migrations/Version202012161236262141_taoItems.php
index 5d4b2e61b..e9aea2c72 100644
--- a/migrations/Version202012161236262141_taoItems.php
+++ b/migrations/Version202012161236262141_taoItems.php
@@ -28,7 +28,6 @@
 
 final class Version202012161236262141_taoItems extends AbstractMigration
 {
-
     public function up(Schema $schema): void
     {
         $this->getServiceManager()->register(
diff --git a/models/classes/CategoryService.php b/models/classes/CategoryService.php
index 955fddf01..fc4ce14b9 100644
--- a/models/classes/CategoryService.php
+++ b/models/classes/CategoryService.php
@@ -35,10 +35,10 @@
  */
 class CategoryService extends ConfigurableService
 {
-    const SERVICE_ID = 'taoItems/Category';
+    public const SERVICE_ID = 'taoItems/Category';
 
-    const ITEM_CLASS_URI  = 'http://www.tao.lu/Ontologies/TAOItem.rdf#Item';
-    const EXPOSE_PROP_URI = 'http://www.tao.lu/Ontologies/TAOItem.rdf#ExposeCategory';
+    public const ITEM_CLASS_URI  = 'http://www.tao.lu/Ontologies/TAOItem.rdf#Item';
+    public const EXPOSE_PROP_URI = 'http://www.tao.lu/Ontologies/TAOItem.rdf#ExposeCategory';
 
     public static $supportedWidgetUris = [
         'http://www.tao.lu/datatypes/WidgetDefinitions.rdf#TextBox',
diff --git a/models/classes/Import/class.ExtractException.php b/models/classes/Import/class.ExtractException.php
index a85df9fbd..55e1812b7 100755
--- a/models/classes/Import/class.ExtractException.php
+++ b/models/classes/Import/class.ExtractException.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
@@ -28,5 +29,4 @@
  */
 class taoItems_models_classes_Import_ExtractException extends taoItems_models_classes_Import_ImportException
 {
-
 }
diff --git a/models/classes/Import/class.ImportException.php b/models/classes/Import/class.ImportException.php
index 0ad393d17..48ef3a83e 100755
--- a/models/classes/Import/class.ImportException.php
+++ b/models/classes/Import/class.ImportException.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
@@ -28,5 +29,4 @@
  */
 class taoItems_models_classes_Import_ImportException extends common_Exception
 {
-
 }
diff --git a/models/classes/Import/class.ParsingException.php b/models/classes/Import/class.ParsingException.php
index ec0091cb0..e7de158da 100755
--- a/models/classes/Import/class.ParsingException.php
+++ b/models/classes/Import/class.ParsingException.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
@@ -28,5 +29,4 @@
  */
 class taoItems_models_classes_Import_ParsingException extends taoItems_models_classes_Import_ImportException
 {
-
 }
diff --git a/models/classes/ItemCompilerIndex.php b/models/classes/ItemCompilerIndex.php
index 9de8e40fc..ab00638f5 100644
--- a/models/classes/ItemCompilerIndex.php
+++ b/models/classes/ItemCompilerIndex.php
@@ -24,7 +24,6 @@
 
 namespace oat\taoItems\model;
 
-
 /**
  * Class ItemCompilerIndex
  * @package oat\taoItems\model
diff --git a/models/classes/ItemModelStatus.php b/models/classes/ItemModelStatus.php
index 5017047e6..4657357e5 100644
--- a/models/classes/ItemModelStatus.php
+++ b/models/classes/ItemModelStatus.php
@@ -22,13 +22,13 @@
 
 interface ItemModelStatus
 {
-    const CLASS_URI = 'http://www.tao.lu/Ontologies/TAOItem.rdf#ItemModelStatus';
+    public const CLASS_URI = 'http://www.tao.lu/Ontologies/TAOItem.rdf#ItemModelStatus';
 
-    const INSTANCE_STABLE = 'http://www.tao.lu/Ontologies/TAOItem.rdf#StatusStable';
+    public const INSTANCE_STABLE = 'http://www.tao.lu/Ontologies/TAOItem.rdf#StatusStable';
 
-    const INSTANCE_DEPRECATED = 'http://www.tao.lu/Ontologies/TAOItem.rdf#StatusDeprecated';
+    public const INSTANCE_DEPRECATED = 'http://www.tao.lu/Ontologies/TAOItem.rdf#StatusDeprecated';
 
-    const INSTANCE_DEV = 'http://www.tao.lu/Ontologies/TAOItem.rdf#StatusDevelopment';
+    public const INSTANCE_DEV = 'http://www.tao.lu/Ontologies/TAOItem.rdf#StatusDevelopment';
 
-    const INSTANCE_EXPERIMENTAL = 'http://www.tao.lu/Ontologies/TAOItem.rdf#StatusExperimental';
+    public const INSTANCE_EXPERIMENTAL = 'http://www.tao.lu/Ontologies/TAOItem.rdf#StatusExperimental';
 }
diff --git a/models/classes/PreviewClientConfigRegistry.php b/models/classes/PreviewClientConfigRegistry.php
index ae1332b38..6ced5e18f 100644
--- a/models/classes/PreviewClientConfigRegistry.php
+++ b/models/classes/PreviewClientConfigRegistry.php
@@ -30,8 +30,7 @@
  */
 class PreviewClientConfigRegistry extends ClientLibConfigRegistry
 {
-
-    const AMD = 'taoItems/controller/preview/itemRunner';
+    public const AMD = 'taoItems/controller/preview/itemRunner';
 
     /**
      * Register an extra button for the preview in the client lib config registry
diff --git a/models/classes/asset/Loader.php b/models/classes/asset/Loader.php
index 58378b68b..ecebb755d 100644
--- a/models/classes/asset/Loader.php
+++ b/models/classes/asset/Loader.php
@@ -21,10 +21,10 @@
 
 namespace oat\taoItems\model\asset;
 
-use \core_kernel_classes_Resource;
-use \taoItems_models_classes_ItemsService;
-use \common_Exception;
-use \tao_helpers_File;
+use core_kernel_classes_Resource;
+use taoItems_models_classes_ItemsService;
+use common_Exception;
+use tao_helpers_File;
 use oat\taoItems\model\media\ItemMediaResolver;
 
 /**
@@ -36,7 +36,6 @@
  */
 class Loader
 {
-
     /**
      * The item to pack
      * @var core_kernel_classes_Resource
diff --git a/models/classes/class.CompilationFailedException.php b/models/classes/class.CompilationFailedException.php
index 11666f630..4811e0092 100755
--- a/models/classes/class.CompilationFailedException.php
+++ b/models/classes/class.CompilationFailedException.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
@@ -28,5 +29,4 @@
  */
 class taoItems_models_classes_CompilationFailedException extends tao_models_classes_CompilationFailedException
 {
-    
 }
diff --git a/models/classes/class.CrudItemsService.php b/models/classes/class.CrudItemsService.php
index 101d5b773..e28d6675c 100755
--- a/models/classes/class.CrudItemsService.php
+++ b/models/classes/class.CrudItemsService.php
@@ -36,7 +36,7 @@ class taoItems_models_classes_CrudItemsService extends tao_models_classes_CrudSe
     use EventManagerAwareTrait;
 
     protected $itemClass = null;
-   
+
     protected $itemsServices = null;
 
     public function __construct()
@@ -55,12 +55,12 @@ protected function getClassService()
     {
         return $this->itemsServices;
     }
-    
+
     public function delete($resource)
     {
-         taoItems_models_classes_ItemsService::singleton()->deleteItem(new core_kernel_classes_Resource($resource));
+        taoItems_models_classes_ItemsService::singleton()->deleteItem(new core_kernel_classes_Resource($resource));
         //parent::delete($resource)
-         return true;
+        return true;
     }
 
 
@@ -69,11 +69,11 @@ public function delete($resource)
      */
     public function createFromArray(array $propertiesValues)
     {
-    
+
         if (!isset($propertiesValues[OntologyRdfs::RDFS_LABEL])) {
             $propertiesValues[OntologyRdfs::RDFS_LABEL] = "";
         }
-        
+
         $type = isset($propertiesValues[OntologyRdf::RDF_TYPE]) ? $propertiesValues[OntologyRdf::RDF_TYPE] : $this->getRootClass();
         $label = $propertiesValues[OntologyRdfs::RDFS_LABEL];
         unset($propertiesValues[OntologyRdfs::RDFS_LABEL]);
diff --git a/models/classes/class.ItemCompiler.php b/models/classes/class.ItemCompiler.php
index 62320ace3..d000931b1 100755
--- a/models/classes/class.ItemCompiler.php
+++ b/models/classes/class.ItemCompiler.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
@@ -38,7 +39,7 @@ protected function getContentUsedLanguages()
     {
         return $this->getResource()->getUsedLanguages(new core_kernel_classes_Property(taoItems_models_classes_ItemsService::PROPERTY_ITEM_CONTENT));
     }
-    
+
     /**
      * deploys the item into the given absolute directory
      *
@@ -50,18 +51,18 @@ protected function getContentUsedLanguages()
     protected function deployItem(core_kernel_classes_Resource $item, $languageCode, $compiledDirectory)
     {
         $itemService = taoItems_models_classes_ItemsService::singleton();
-            
+
         // copy local files
         $sourceDir = $itemService->getItemDirectory($item, $languageCode);
         $success = taoItems_helpers_Deployment::copyResources($sourceDir->getPrefix(), $compiledDirectory, ['index.html']);
         if (!$success) {
             return $this->fail(__('Unable to copy resources for language %s', $languageCode));
         }
-        
+
         // render item
-        
+
         $xhtml = $itemService->render($item, $languageCode);
-            
+
         // retrieve external resources
         $subReport = taoItems_helpers_Deployment::retrieveExternalResources($xhtml, $compiledDirectory);
         if ($subReport->getType() == common_report_Report::TYPE_SUCCESS) {
@@ -76,7 +77,7 @@ protected function deployItem(core_kernel_classes_Resource $item, $languageCode,
             return $subReport;
         }
     }
-    
+
     /**
      * Create the item's ServiceCall.
      *
@@ -95,10 +96,10 @@ protected function createService(core_kernel_classes_Resource $item, tao_models_
             new core_kernel_classes_Resource(taoItems_models_classes_ItemsService::INSTANCE_FORMAL_PARAM_ITEM_URI),
             $item
         ));
-        
+
         return $service;
     }
-    
+
     protected function getSubCompilerClass(core_kernel_classes_Resource $resource)
     {
         throw new common_Exception('Items cannot include other resources');
diff --git a/models/classes/class.ItemExporter.php b/models/classes/class.ItemExporter.php
index 64b9d2564..bed3dde9c 100644
--- a/models/classes/class.ItemExporter.php
+++ b/models/classes/class.ItemExporter.php
@@ -40,14 +40,11 @@
  * @package taoItems
 
  */
-
+
 use Psr\Http\Message\StreamInterface;
-
+
 abstract class taoItems_models_classes_ItemExporter
 {
-
-
-
     private $item;
     private $zip;
 
@@ -62,7 +59,7 @@ public function __construct(core_kernel_classes_Resource $item, ZipArchive $zip)
         $this->setItem($item);
         $this->setZip($zip);
     }
-    
+
     /**
      * Obtains a reference on the TAO Item Service.
      *
@@ -72,7 +69,7 @@ protected function getItemService()
     {
         return taoItems_models_classes_ItemsService::singleton();
     }
-  
+
     /**
      * Obtains a reference on the currently exported instance of Item.
      *
@@ -82,12 +79,12 @@ protected function getItem()
     {
         return $this->item;
     }
-    
+
     protected function setItem(core_kernel_classes_Resource $item)
     {
         $this->item = $item;
     }
-   
+
     /**
      * Obtains a reference on the Zip Archive where the files related to the exported items will be stored.
      *
@@ -97,12 +94,12 @@ public function getZip()
     {
         return $this->zip;
     }
- 
+
     public function setZip(ZipArchive $zip)
     {
         $this->zip = $zip;
     }
- 
+
     /**
      * Obtains a reference on the Item Model related to the currently exported item instance.
      *
@@ -121,7 +118,7 @@ protected function getItemDirectory()
     {
         return $this->getItemService()->getItemDirectory($this->getItem());
     }
- 
+
     /**
      * Add files or folders (and their content) to the Zip Archive that will contain all the files to the current export session.
      * For instance, if you want to copy the file 'taoItems/data/i123/item.xml' as 'myitem.xml' to your archive call addFile('path_to_item_location/item.xml', 'myitem.xml').
@@ -136,6 +133,6 @@ public function addFile($src, $dest)
         $zip = $this->getZip();
         return tao_helpers_File::addFilesToZip($zip, $src, $dest);
     }
- 
+
     abstract public function export();
 }
diff --git a/models/classes/class.ItemModelException.php b/models/classes/class.ItemModelException.php
index 8e02ac547..f6b620b53 100644
--- a/models/classes/class.ItemModelException.php
+++ b/models/classes/class.ItemModelException.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
@@ -28,5 +29,4 @@
  */
 class taoItems_models_classes_ItemModelException extends common_Exception
 {
-    
 }
diff --git a/models/classes/class.TemplateRenderer.php b/models/classes/class.TemplateRenderer.php
index d4a2e2e25..4649c6215 100644
--- a/models/classes/class.TemplateRenderer.php
+++ b/models/classes/class.TemplateRenderer.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
@@ -64,21 +65,21 @@ class taoItems_models_classes_TemplateRenderer
      */
     public function __construct($templatePath, $variables = [])
     {
-        
-        
+
+
         if (
             !file_exists($templatePath)
             || !is_readable($templatePath)
             || !preg_match("/\.tpl\.php$/", basename($templatePath))
         ) {
-                common_Logger::w('Template ', $templatePath . ' not found');
-                throw new InvalidArgumentException("Unable to load the template file from $templatePath");
+            common_Logger::w('Template ', $templatePath . ' not found');
+            throw new InvalidArgumentException("Unable to load the template file from $templatePath");
         }
-        
+
         if (!tao_helpers_File::securityCheck($templatePath)) {
             throw new Exception("Security warning: $templatePath is not safe.");
         }
-        
+
         $this->renderer = new Renderer($templatePath, $variables);
     }
 
@@ -93,10 +94,10 @@ public function __construct($templatePath, $variables = [])
      */
     public static function setContext($parameters, $prefix = '')
     {
-        
-        
+
+
         self::$context = [];
-        
+
         foreach ($parameters as $key => $value) {
             self::$context[$prefix . $key] = $value;
         }
@@ -112,7 +113,7 @@ public static function setContext($parameters, $prefix = '')
      */
     public function setTemplate($templatePath)
     {
-        
+
         $this->renderer->setTemplate($templatePath);
     }
 
@@ -127,7 +128,7 @@ public function setTemplate($templatePath)
      */
     public function setData($key, $value)
     {
-        
+
         $this->renderer->setData($key, $value);
     }
 
@@ -142,10 +143,10 @@ public function render()
     {
         $returnValue = (string) '';
 
-        
+
         $this->renderer->setMultipleData(self::$context);
         $returnValue = $this->renderer->render();
-        
+
 
         return (string) $returnValue;
     }
diff --git a/models/classes/event/ItemContentClonedEvent.php b/models/classes/event/ItemContentClonedEvent.php
index 7f4727a65..d9ba675df 100644
--- a/models/classes/event/ItemContentClonedEvent.php
+++ b/models/classes/event/ItemContentClonedEvent.php
@@ -26,7 +26,6 @@
 
 class ItemContentClonedEvent implements Event, JsonSerializable
 {
-
     /** @var  string */
     protected $sourceItemUri;
 
diff --git a/models/classes/event/ItemCreatedEvent.php b/models/classes/event/ItemCreatedEvent.php
index 9b539089b..6d8550104 100644
--- a/models/classes/event/ItemCreatedEvent.php
+++ b/models/classes/event/ItemCreatedEvent.php
@@ -26,7 +26,6 @@
 
 class ItemCreatedEvent implements Event, JsonSerializable
 {
-
     /** @var  string */
     protected $itemUri;
 
diff --git a/models/classes/event/ItemDuplicatedEvent.php b/models/classes/event/ItemDuplicatedEvent.php
index c3afcbe4a..df4da83a5 100644
--- a/models/classes/event/ItemDuplicatedEvent.php
+++ b/models/classes/event/ItemDuplicatedEvent.php
@@ -26,7 +26,6 @@
 
 class ItemDuplicatedEvent implements Event, JsonSerializable
 {
-
     /** @var  string */
     protected $itemUri;
 
diff --git a/models/classes/event/ItemExportEvent.php b/models/classes/event/ItemExportEvent.php
index 522cfb57d..15053c42d 100644
--- a/models/classes/event/ItemExportEvent.php
+++ b/models/classes/event/ItemExportEvent.php
@@ -26,7 +26,6 @@
 
 class ItemExportEvent implements Event, JsonSerializable
 {
-
     /** @var  string */
     protected $itemUri;
 
diff --git a/models/classes/event/ItemImportEvent.php b/models/classes/event/ItemImportEvent.php
index 50b5ffe06..b286bec09 100644
--- a/models/classes/event/ItemImportEvent.php
+++ b/models/classes/event/ItemImportEvent.php
@@ -26,7 +26,6 @@
 
 class ItemImportEvent implements Event, JsonSerializable
 {
-
     /** @var  string */
     protected $itemUri;
 
diff --git a/models/classes/event/ItemRdfUpdatedEvent.php b/models/classes/event/ItemRdfUpdatedEvent.php
index 93cd9966a..3674c441d 100644
--- a/models/classes/event/ItemRdfUpdatedEvent.php
+++ b/models/classes/event/ItemRdfUpdatedEvent.php
@@ -28,5 +28,4 @@
  */
 class ItemRdfUpdatedEvent extends ItemUpdatedEvent
 {
-    
 }
diff --git a/models/classes/event/ItemRemovedEvent.php b/models/classes/event/ItemRemovedEvent.php
index 395a31efb..c6d6eda44 100644
--- a/models/classes/event/ItemRemovedEvent.php
+++ b/models/classes/event/ItemRemovedEvent.php
@@ -26,7 +26,6 @@
 
 class ItemRemovedEvent implements Event, JsonSerializable
 {
-
     /** @var  string */
     protected $itemUri;
 
diff --git a/models/classes/event/ItemUpdatedEvent.php b/models/classes/event/ItemUpdatedEvent.php
index 0457ee9fb..dba6314b7 100644
--- a/models/classes/event/ItemUpdatedEvent.php
+++ b/models/classes/event/ItemUpdatedEvent.php
@@ -26,7 +26,6 @@
 
 class ItemUpdatedEvent implements Event, JsonSerializable
 {
-
     /** @var  string */
     protected $itemUri;
 
@@ -53,7 +52,7 @@ public function getName()
     {
         return get_class($this);
     }
-    
+
     /**
      * event data getter
      * @return array
@@ -62,7 +61,7 @@ public function getData()
     {
         return $this->data;
     }
-    
+
     /**
      * event item URI getter
      * @return string
diff --git a/models/classes/exporter/class.DefaultItemExporter.php b/models/classes/exporter/class.DefaultItemExporter.php
index c413e520e..00416b65a 100644
--- a/models/classes/exporter/class.DefaultItemExporter.php
+++ b/models/classes/exporter/class.DefaultItemExporter.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
@@ -21,7 +22,6 @@
 
 class taoItems_models_classes_exporter_DefaultItemExporter extends taoItems_models_classes_ItemExporter
 {
-
     public function export($options = [])
     {
         $location = $this->getItemDirectory()->readStream('qti.xml');
diff --git a/models/classes/interface.ExportableItemModel.php b/models/classes/interface.ExportableItemModel.php
index ed08ec8e0..efe1fcc25 100755
--- a/models/classes/interface.ExportableItemModel.php
+++ b/models/classes/interface.ExportableItemModel.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
@@ -27,5 +28,4 @@
  */
 interface taoItems_models_classes_ExportableItemModel extends tao_models_classes_export_ExportProvider
 {
-    
 }
diff --git a/models/classes/interface.ImportableItemModel.php b/models/classes/interface.ImportableItemModel.php
index 9dd604495..e51c39ff3 100755
--- a/models/classes/interface.ImportableItemModel.php
+++ b/models/classes/interface.ImportableItemModel.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
diff --git a/models/classes/interface.itemModel.php b/models/classes/interface.itemModel.php
index a3b14640e..5093414b9 100755
--- a/models/classes/interface.itemModel.php
+++ b/models/classes/interface.itemModel.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
@@ -31,9 +32,9 @@
  */
 interface taoItems_models_classes_itemModel
 {
-    const CLASS_URI_MODELS = 'http://www.tao.lu/Ontologies/TAOItem.rdf#ItemModels';
-    const CLASS_URI_RUNTIME = 'http://www.tao.lu/Ontologies/TAOItem.rdf#ItemRuntime';
-    const CLASS_URI_QTI = 'http://www.tao.lu/Ontologies/TAOItem.rdf#QTI';
+    public const CLASS_URI_MODELS = 'http://www.tao.lu/Ontologies/TAOItem.rdf#ItemModels';
+    public const CLASS_URI_RUNTIME = 'http://www.tao.lu/Ontologies/TAOItem.rdf#ItemRuntime';
+    public const CLASS_URI_QTI = 'http://www.tao.lu/Ontologies/TAOItem.rdf#QTI';
 
     /**
      * constructor called by itemService
diff --git a/models/classes/media/ItemMediaResolver.php b/models/classes/media/ItemMediaResolver.php
index 96c0619f0..454af28b3 100644
--- a/models/classes/media/ItemMediaResolver.php
+++ b/models/classes/media/ItemMediaResolver.php
@@ -27,7 +27,6 @@
 
 class ItemMediaResolver extends TaoMediaResolver
 {
-
     private $localMediaSource;
 
     public function __construct($item, $lang)
diff --git a/models/classes/media/LocalItemSource.php b/models/classes/media/LocalItemSource.php
index 6c77c19ab..ed94a4c4e 100644
--- a/models/classes/media/LocalItemSource.php
+++ b/models/classes/media/LocalItemSource.php
@@ -37,9 +37,8 @@
  */
 class LocalItemSource implements MediaManagement
 {
-
     private $item;
-    
+
     private $lang;
 
     protected $itemService;
@@ -66,8 +65,8 @@ public function getItem()
     public function getDirectories(DirectorySearchQuery $params): array
     {
         return $this->searchDirectories(
-            $params->getParentLink(), 
-            $params->getFilter(), 
+            $params->getParentLink(),
+            $params->getFilter(),
             $params->getDepth(),
             $params->getChildrenLimit()
         );
diff --git a/models/classes/ontology/ItemAuthorRole.php b/models/classes/ontology/ItemAuthorRole.php
index 9af5d2057..242fbe028 100644
--- a/models/classes/ontology/ItemAuthorRole.php
+++ b/models/classes/ontology/ItemAuthorRole.php
@@ -24,5 +24,5 @@
 class ItemAuthorRole
 {
     /** @deprecated Use \oat\taoItems\model\user\TaoItemsRoles::ITEM_AUTHOR */
-    const INSTANCE_URI = 'http://www.tao.lu/Ontologies/TAOItem.rdf#ItemAuthor';
+    public const INSTANCE_URI = 'http://www.tao.lu/Ontologies/TAOItem.rdf#ItemAuthor';
 }
diff --git a/models/classes/pack/ExceptionMissingAsset.php b/models/classes/pack/ExceptionMissingAsset.php
index 47e937d2a..3ec7d5b6b 100644
--- a/models/classes/pack/ExceptionMissingAsset.php
+++ b/models/classes/pack/ExceptionMissingAsset.php
@@ -25,5 +25,4 @@
 
 class ExceptionMissingAsset extends common_Exception
 {
-
 }
diff --git a/models/classes/pack/ExceptionMissingEncoder.php b/models/classes/pack/ExceptionMissingEncoder.php
index 948ae24b4..fb2957d08 100644
--- a/models/classes/pack/ExceptionMissingEncoder.php
+++ b/models/classes/pack/ExceptionMissingEncoder.php
@@ -25,5 +25,4 @@
 
 class ExceptionMissingEncoder extends common_Exception
 {
-
 }
diff --git a/models/classes/pack/ItemPacker.php b/models/classes/pack/ItemPacker.php
index b63c7f1da..a36eefac2 100644
--- a/models/classes/pack/ItemPacker.php
+++ b/models/classes/pack/ItemPacker.php
@@ -22,8 +22,8 @@
 
 namespace oat\taoItems\model\pack;
 
-use \core_kernel_classes_Resource;
-use \common_Exception;
+use core_kernel_classes_Resource;
+use common_Exception;
 use oat\oatbox\filesystem\Directory;
 
 /**
@@ -34,7 +34,6 @@
  */
 abstract class ItemPacker
 {
-
     /**
      * Determines what type of assets should be packed as well as packer
      * @example array('css'=>'base64')
diff --git a/models/classes/pack/Packer.php b/models/classes/pack/Packer.php
index 908b96563..4d770e193 100644
--- a/models/classes/pack/Packer.php
+++ b/models/classes/pack/Packer.php
@@ -21,12 +21,12 @@
 
 namespace oat\taoItems\model\pack;
 
-use \core_kernel_classes_Resource;
+use core_kernel_classes_Resource;
 use oat\oatbox\filesystem\Directory;
-use \taoItems_models_classes_ItemsService;
-use \common_exception_NoImplementation;
-use \common_Exception;
-use \Exception;
+use taoItems_models_classes_ItemsService;
+use common_exception_NoImplementation;
+use common_Exception;
+use Exception;
 use Zend\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorAwareTrait;
 
diff --git a/models/classes/pack/encoders/Base64fileEncoder.php b/models/classes/pack/encoders/Base64fileEncoder.php
index 6c58c3b03..8863f474a 100644
--- a/models/classes/pack/encoders/Base64fileEncoder.php
+++ b/models/classes/pack/encoders/Base64fileEncoder.php
@@ -43,7 +43,7 @@ class Base64fileEncoder implements Encoding
     private $directory;
 
     /** Applied data-uri format placeholder */
-    const DATA_PREFIX = 'data:%s;base64,%s';
+    public const DATA_PREFIX = 'data:%s;base64,%s';
 
     /**
      * Base64fileEncoder constructor.
diff --git a/models/classes/preview/ItemPreviewerService.php b/models/classes/preview/ItemPreviewerService.php
index 51bea5d65..6bd696930 100644
--- a/models/classes/preview/ItemPreviewerService.php
+++ b/models/classes/preview/ItemPreviewerService.php
@@ -34,7 +34,7 @@
  */
 class ItemPreviewerService extends ConfigurableService
 {
-    const SERVICE_ID = 'taoItems/ItemPreviewer';
+    public const SERVICE_ID = 'taoItems/ItemPreviewer';
     private const REGISTRY_ENTRY_KEY = 'taoItems/previewer/factory';
     private const PREVIEWERS_KEY = 'previewers';
     private const PLUGINS_KEY = 'plugins';
diff --git a/models/classes/preview/OntologyItemNotFoundException.php b/models/classes/preview/OntologyItemNotFoundException.php
index 270eae528..40b956e2c 100644
--- a/models/classes/preview/OntologyItemNotFoundException.php
+++ b/models/classes/preview/OntologyItemNotFoundException.php
@@ -23,7 +23,6 @@
 
 class OntologyItemNotFoundException extends \Exception implements \common_exception_UserReadableException
 {
-
     public function getUserMessage()
     {
         return __('Item not found');
diff --git a/models/classes/render/ItemAssetsReplacement.php b/models/classes/render/ItemAssetsReplacement.php
index 31f2e0ef0..0a99e4a08 100755
--- a/models/classes/render/ItemAssetsReplacement.php
+++ b/models/classes/render/ItemAssetsReplacement.php
@@ -31,8 +31,7 @@
  */
 interface ItemAssetsReplacement
 {
-
-    const SERVICE_ID = 'taoItems/replacement';
+    public const SERVICE_ID = 'taoItems/replacement';
 
 
     /**
diff --git a/models/classes/render/NoneItemReplacement.php b/models/classes/render/NoneItemReplacement.php
index b14617ac8..fa96f3b32 100755
--- a/models/classes/render/NoneItemReplacement.php
+++ b/models/classes/render/NoneItemReplacement.php
@@ -33,8 +33,6 @@
  */
 class NoneItemReplacement extends ConfigurableService implements ItemAssetsReplacement
 {
-
-
     public function postProcessAssets($string)
     {
         return $string;
diff --git a/models/classes/search/class.XmlItemContentTokenizer.php b/models/classes/search/class.XmlItemContentTokenizer.php
index 59ddb327b..7bf2e9a56 100644
--- a/models/classes/search/class.XmlItemContentTokenizer.php
+++ b/models/classes/search/class.XmlItemContentTokenizer.php
@@ -34,17 +34,17 @@ class taoItems_models_classes_search_XmlItemContentTokenizer implements Tokenize
     public function getStrings($values)
     {
         $contentStrings = [];
-        
+
         if (is_array($values) === false) {
             $values = [$values];
         }
-        
+
         foreach ($values as $value) {
             if ($value instanceof DOMDocument) {
                 $xpath = new DOMXPath($value);
                 $textNodes = $xpath->query('//text()');
                 unset($xpath);
-                
+
                 foreach ($textNodes as $textNode) {
                     if (ctype_space($textNode->wholeText) === false) {
                         $contentStrings[] = trim($textNode->wholeText);
@@ -52,7 +52,7 @@ public function getStrings($values)
                 }
             }
         }
-        
+
         return $contentStrings;
     }
 }
diff --git a/scripts/update/class.Updater.php b/scripts/update/class.Updater.php
index 7c316fa17..c50129c3b 100644
--- a/scripts/update/class.Updater.php
+++ b/scripts/update/class.Updater.php
@@ -38,7 +38,6 @@
  */
 class taoItems_scripts_update_Updater extends common_ext_ExtensionUpdater
 {
-
     /**
      * @param $initialVersion
      * @return string|void
@@ -121,7 +120,7 @@ public function update($initialVersion)
         }
 
         $this->skip('9.0.0', '10.7.1');
-        
+
         //Updater files are deprecated. Please use migrations.
         //See: https://github.com/oat-sa/generis/wiki/Tao-Update-Process
 
diff --git a/test/integration/XhtmlTest.php b/test/integration/XhtmlTest.php
index 03e0729b8..0ae3e3f87 100644
--- a/test/integration/XhtmlTest.php
+++ b/test/integration/XhtmlTest.php
@@ -37,7 +37,6 @@
  */
 class XhtmlTestCase extends TestCase
 {
-
     public function testGetScriptElements()
     {
         $file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'xhtml' . DIRECTORY_SEPARATOR . 'raw.html';
@@ -53,7 +52,7 @@ public function testGetScriptElements()
             $this->assertTrue(false, "An error occured while parsing '${file}'.");
         }
     }
-    
+
     public function testHasScriptElements()
     {
         $file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'xhtml' . DIRECTORY_SEPARATOR . 'raw.html';
@@ -69,7 +68,7 @@ public function testHasScriptElements()
             $this->assertTrue(false, "An error occured while parsing '${file}'.");
         }
     }
-    
+
     public function testRemoveScriptElements()
     {
         $file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'xhtml' . DIRECTORY_SEPARATOR . 'raw.html';
@@ -85,7 +84,7 @@ public function testRemoveScriptElements()
             $this->assertTrue(false, "An error occured while parsing '${file}'.");
         }
     }
-    
+
     public function testAddScriptElement()
     {
         $file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'xhtml' . DIRECTORY_SEPARATOR . 'raw.html';
@@ -97,7 +96,7 @@ public function testAddScriptElement()
                 $addedElements = taoItems_helpers_Xhtml::getScriptElements($dom, '/^taomatching.js/iu');
                 $this->assertEquals(1, count($addedElements));
                 $added = $addedElements[0];
-                
+
                 // Was it really appended?
                 $xpath = new DOMXPath($dom);
                 $heads = $xpath->query('/html/head');
@@ -105,7 +104,7 @@ public function testAddScriptElement()
                     $this->assertTrue($head->lastChild === $added);
                     break;
                 }
-                
+
                 // -- Prepend
                 taoItems_helpers_Xhtml::addScriptElement($dom, 'http://www.taotesting.com/scripts/wfapi.min.js', $append = false);
                 $addedElements = taoItems_helpers_Xhtml::getScriptElements($dom, '/wfapi\.min/');
diff --git a/test/integration/pack/PackerTest.php b/test/integration/pack/PackerTest.php
index 733106554..797f19d06 100644
--- a/test/integration/pack/PackerTest.php
+++ b/test/integration/pack/PackerTest.php
@@ -18,10 +18,11 @@
  * Copyright (c) 2015 (original work) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  *
  */
+
 namespace oat\taoItems\test\integration\pack;
 
 use common_Exception;
-use \core_kernel_classes_Resource;
+use core_kernel_classes_Resource;
 use oat\generis\test\TestCase;
 use oat\oatbox\filesystem\Directory;
 use oat\taoItems\model\pack\ItemPacker;
diff --git a/test/integration/taoApiServer.php b/test/integration/taoApiServer.php
index ff8b49d6b..3988451c4 100644
--- a/test/integration/taoApiServer.php
+++ b/test/integration/taoApiServer.php
@@ -26,7 +26,7 @@
         (isset($_POST['token'])) ? ($_POST['token'] == '7114e56cb3b9423314a425500afb41fc56183000') ? $saved = true : $saved = false : $saved = false;
         echo json_encode(['saved' => $saved]);
         break;
-        
+
     case 'traceEvents':
         (isset($_POST['token'])) ? ($_POST['token'] == '7114e56cb3b9423314a425500afb41fc56183000') ? $saved = true : $saved = false : $saved = false;
         if ($saved) {
diff --git a/test/unit/XmlItemContentTokenizerTest.php b/test/unit/XmlItemContentTokenizerTest.php
index 233687eec..47e075a65 100644
--- a/test/unit/XmlItemContentTokenizerTest.php
+++ b/test/unit/XmlItemContentTokenizerTest.php
@@ -45,10 +45,10 @@ public function testSimpleXmlContent()
               </p> with some other text...
             </myTag>
         ');
-        
+
         $tokenizer = new XmlItemContentTokenizer();
         $tokens = $tokenizer->getStrings($dom);
-        
+
         $this->assertEquals('A paragraph', $tokens[0]);
         $this->assertEquals('with some other text...', $tokens[1]);
     }
diff --git a/test/unit/models/classes/ItemsServiceTest.php b/test/unit/models/classes/ItemsServiceTest.php
index 55d3f9d57..a89fd98cc 100644
--- a/test/unit/models/classes/ItemsServiceTest.php
+++ b/test/unit/models/classes/ItemsServiceTest.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
@@ -38,4 +39,3 @@ public function testComposeItemDirectoryPathReturnsStringPath()
         self::assertIsString($path, 'Method must return string directory path.');
     }
 }
-
diff --git a/test/unit/pack/ItemPackTest.php b/test/unit/pack/ItemPackTest.php
index c2316d342..3d352298e 100644
--- a/test/unit/pack/ItemPackTest.php
+++ b/test/unit/pack/ItemPackTest.php
@@ -105,7 +105,7 @@ public function testSetAssetWithMediaSource()
                 MediaAsset::class,
                 [
                     'getMediaIdentifier' => 'fixture-id',
-                    'getMediaSource' => new class extends HttpSource {
+                    'getMediaSource' => new class () extends HttpSource {
                     }
                 ]
             ),
@@ -113,7 +113,7 @@ public function testSetAssetWithMediaSource()
                 MediaAsset::class,
                 [
                     'getMediaIdentifier' => self::ENCODED_IMAGE,
-                    'getMediaSource' => new class extends HttpSource {
+                    'getMediaSource' => new class () extends HttpSource {
                     }
                 ]
             )
diff --git a/test/unit/pack/encoder/Base64EncoderTest.php b/test/unit/pack/encoder/Base64EncoderTest.php
index bc8770b8b..7a66b46f2 100644
--- a/test/unit/pack/encoder/Base64EncoderTest.php
+++ b/test/unit/pack/encoder/Base64EncoderTest.php
@@ -18,6 +18,7 @@
  * Copyright (c) 2016 (original work) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  *
  */
+
 namespace oat\taoItems\test\unit\pack\encoder;
 
 use oat\generis\test\TestCase;
diff --git a/test/unit/pack/encoder/Base64fileEncoderTest.php b/test/unit/pack/encoder/Base64fileEncoderTest.php
index 821452463..34d893370 100644
--- a/test/unit/pack/encoder/Base64fileEncoderTest.php
+++ b/test/unit/pack/encoder/Base64fileEncoderTest.php
@@ -18,6 +18,7 @@
  * Copyright (c) 2016 (original work) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  *
  */
+
 namespace oat\taoItems\test\unit\pack\encoder;
 
 use oat\generis\test\TestCase;
diff --git a/test/unit/pack/encoder/NoneEncoderTest.php b/test/unit/pack/encoder/NoneEncoderTest.php
index 0305e9864..20c0ecc7c 100644
--- a/test/unit/pack/encoder/NoneEncoderTest.php
+++ b/test/unit/pack/encoder/NoneEncoderTest.php
@@ -18,6 +18,7 @@
  * Copyright (c) 2016 (original work) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  *
  */
+
 namespace oat\taoItems\test\unit\pack\encoder;
 
 use oat\generis\test\TestCase;
@@ -31,7 +32,6 @@
  */
 class NoneEncoderTest extends TestCase
 {
-
     /**
      * Test encoder
      */
diff --git a/test/unit/preview/ItemPreviewerServiceTest.php b/test/unit/preview/ItemPreviewerServiceTest.php
index 5b11f6bb2..c99bde784 100644
--- a/test/unit/preview/ItemPreviewerServiceTest.php
+++ b/test/unit/preview/ItemPreviewerServiceTest.php
@@ -36,7 +36,6 @@
  */
 class ItemPreviewerServiceTest extends TestCase
 {
-
     //data to stub the registry content
     private static $adapterData = [
         'taoItems/previewer/factory' => [
diff --git a/test/unit/render/NoneItemReplacementTest.php b/test/unit/render/NoneItemReplacementTest.php
index 99b1b95f4..69610f1aa 100644
--- a/test/unit/render/NoneItemReplacementTest.php
+++ b/test/unit/render/NoneItemReplacementTest.php
@@ -29,7 +29,6 @@
  */
 class NoneItemReplacementTest extends TestCase
 {
-
     /**
      * Test encoder
      */

From a0abc31e8b4b3a2da5f304625a286709b2f8aba6 Mon Sep 17 00:00:00 2001
From: Andrei Shapiro <shpr.andrew@gmail.com>
Date: Thu, 4 May 2023 07:22:59 +0000
Subject: [PATCH 2/2] chore: apply PSR-12 manual cnahges

---
 actions/class.ItemExport.php                  | 16 +++--
 actions/class.ItemImport.php                  | 15 +++--
 actions/class.ItemPreview.php                 | 13 +++--
 actions/class.Items.php                       | 12 ++--
 actions/class.Main.php                        |  9 ++-
 actions/class.SaSItems.php                    | 18 ++++--
 actions/form/class.Item.php                   |  7 ++-
 helpers/class.Deployment.php                  | 46 +++++++++++----
 helpers/class.Xhtml.php                       | 10 ++--
 helpers/class.Xslt.php                        | 20 +++++--
 includes/constants.php                        | 11 ++--
 includes/raw_start.php                        | 13 +++--
 manifest.php                                  |  9 ++-
 .../classes/Import/class.ExtractException.php |  8 ++-
 .../classes/Import/class.ImportException.php  |  8 ++-
 .../classes/Import/class.ParsingException.php |  8 ++-
 models/classes/class.CrudItemsService.php     |  4 +-
 models/classes/class.ItemCompiler.php         | 23 ++++++--
 models/classes/class.ItemExporter.php         | 19 ++++--
 models/classes/class.ItemModelException.php   | 35 +++++------
 models/classes/class.ItemsService.php         | 44 ++++++++++----
 models/classes/class.TemplateRenderer.php     |  7 ++-
 .../exporter/class.DefaultItemExporter.php    |  6 +-
 .../classes/interface.ExportableItemModel.php |  7 ++-
 .../classes/interface.ImportableItemModel.php |  7 ++-
 models/classes/interface.itemModel.php        |  8 +--
 models/classes/pack/ItemPack.php              |  3 +
 scripts/install/CreateItemDirectory.php       |  9 ++-
 scripts/update/class.Updater.php              | 26 ++++++++-
 test/integration/ItemsTest.php                | 11 +++-
 test/integration/XhtmlTest.php                | 57 +++++++++++-------
 .../integration/media/LocalItemSourceTest.php |  3 +-
 test/integration/taoApiServer.php             | 22 ++++---
 test/unit/XmlItemContentTokenizerTest.php     |  7 ++-
 .../models/classes/CategoryServiceTest.php    | 14 ++++-
 test/unit/pack/ItemPackTest.php               | 58 ++++++++++++++++++-
 36 files changed, 416 insertions(+), 177 deletions(-)

diff --git a/actions/class.ItemExport.php b/actions/class.ItemExport.php
index a791d54d9..a6649c6b5 100644
--- a/actions/class.ItemExport.php
+++ b/actions/class.ItemExport.php
@@ -15,9 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  *               2012-2018 (update and modification) Open Assessment Technologies SA;
  */
 
@@ -92,14 +95,17 @@ protected function getFormFactory(
         $formFactory = parent::getFormFactory($handlers, $exporter, $selectedResource, $formData);
         $instances = $this->getClassInstances();
         if (!count($instances)) {
-            $formFactory->setInfoBox(__('<b>Note</b>: For empty classes, the RDF format<br />is the only available format.'));
+            $formFactory->setInfoBox(
+                __('<b>Note</b>: For empty classes, the RDF format<br />is the only available format.')
+            );
         }
         return $formFactory;
     }
 
     /**
      * Function returns items to export.
-     * Items that has no content (<b>QTI items</b> without <i>qti.xml</i> file or empty <b>Open Web Items</b>) will be filtered
+     * Items that has no content (<b>QTI items</b> without <i>qti.xml</i> file or empty <b>Open Web Items</b>) will be
+     * filtered
      *
      * @return core_kernel_classes_Resource[] An array of items.
      */
diff --git a/actions/class.ItemImport.php b/actions/class.ItemImport.php
index 7a8ddc850..0c023749f 100755
--- a/actions/class.ItemImport.php
+++ b/actions/class.ItemImport.php
@@ -15,9 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  *               2012-2021 (update and modification) Open Assessment Technologies SA;
  */
 
@@ -74,7 +77,11 @@ private function replaceAvailableImportHandlers(): array
 
         foreach (array_keys($returnValue) as $key) {
             if ($returnValue[$key] instanceof \tao_models_classes_import_CsvImporter) {
-                if ($this->getFeatureFlagChecker()->isEnabled(FeatureFlagCheckerInterface::FEATURE_FLAG_TABULAR_IMPORT)) {
+                $tabularImportEnabled = $this
+                    ->getFeatureFlagChecker()
+                    ->isEnabled(FeatureFlagCheckerInterface::FEATURE_FLAG_TABULAR_IMPORT);
+
+                if ($tabularImportEnabled) {
                     $importer = new CsvItemImporter($this->getPsrRequest());
                     $importer->setServiceLocator($this->getServiceLocator());
                     $returnValue[$key] = $importer;
diff --git a/actions/class.ItemPreview.php b/actions/class.ItemPreview.php
index a767b78f0..50020d06e 100755
--- a/actions/class.ItemPreview.php
+++ b/actions/class.ItemPreview.php
@@ -15,9 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  *               2013-2018(update and modification) Open Assessment Technologies SA;
  */
 
@@ -102,7 +105,9 @@ public function render()
 
     protected function getRenderedItem($item)
     {
-        $itemModel = $item->getOnePropertyValue($this->getProperty(taoItems_models_classes_ItemsService::PROPERTY_ITEM_MODEL));
+        $itemModel = $item->getOnePropertyValue(
+            $this->getProperty(taoItems_models_classes_ItemsService::PROPERTY_ITEM_MODEL)
+        );
         $impl = taoItems_models_classes_ItemsService::singleton()->getItemModelImplementation($itemModel);
         if (is_null($impl)) {
             throw new common_Exception('preview not supported for this item type ' . $itemModel->getUri());
diff --git a/actions/class.Items.php b/actions/class.Items.php
index f64370489..43cc36e1b 100755
--- a/actions/class.Items.php
+++ b/actions/class.Items.php
@@ -1,6 +1,5 @@
 <?php
 
-// phpcs:disable Generic.Files.LineLength
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,13 +15,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  *               2012-2018 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
- *
  */
-// phpcs:enable
 
 declare(strict_types=1);
 
diff --git a/actions/class.Main.php b/actions/class.Main.php
index 9682a6756..19e1a798e 100644
--- a/actions/class.Main.php
+++ b/actions/class.Main.php
@@ -15,9 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  *               2012-2018 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  */
 
diff --git a/actions/class.SaSItems.php b/actions/class.SaSItems.php
index 9418c85f7..7c0bd0e4b 100644
--- a/actions/class.SaSItems.php
+++ b/actions/class.SaSItems.php
@@ -15,10 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 use oat\generis\model\OntologyRdfs;
@@ -59,7 +61,13 @@ public function sasEditInstance()
         $clazz = $this->getCurrentClass();
         $instance = $this->getCurrentInstance();
 
-        $formContainer = new tao_actions_form_Instance($clazz, $instance, [FormContainer::CSRF_PROTECTION_OPTION => true]);
+        $formContainer = new tao_actions_form_Instance(
+            $clazz,
+            $instance,
+            [
+                FormContainer::CSRF_PROTECTION_OPTION => true,
+            ]
+        );
         $myForm = $formContainer->getForm();
 
         if ($myForm->isSubmited() && $myForm->isValid()) {
diff --git a/actions/form/class.Item.php b/actions/form/class.Item.php
index ed34bde80..5fc9b2304 100644
--- a/actions/form/class.Item.php
+++ b/actions/form/class.Item.php
@@ -15,9 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 use oat\taoItems\model\ItemModelStatus;
diff --git a/helpers/class.Deployment.php b/helpers/class.Deployment.php
index 43fc38dd7..fc27f4005 100755
--- a/helpers/class.Deployment.php
+++ b/helpers/class.Deployment.php
@@ -15,10 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 /**
@@ -31,7 +33,20 @@
  */
 class taoItems_helpers_Deployment
 {
-    private static $defaultMedia = ["jpg", "jpeg", "png", "gif", "mp3", 'mp4', 'webm', 'swf', 'wma', 'wav', 'css', 'js'];
+    private static $defaultMedia = [
+        "jpg",
+        "jpeg",
+        "png",
+        "gif",
+        "mp3",
+        'mp4',
+        'webm',
+        'swf',
+        'wma',
+        'wav',
+        'css',
+        'js',
+    ];
 
     /**
      * Copy the resources from one directory to another
@@ -81,7 +96,8 @@ public static function retrieveExternalResources($xhtml, $destination)
         $authorizedMedia = self::$defaultMedia;
 
         $mediaList = [];
-        $expr = "/http[s]?:(\\\\)?\/(\\\\)?\/[^<'\"&?]+\.(" . implode('|', $authorizedMedia) . ")/mi";//take into account json encoded url
+        //take into account json encoded url
+        $expr = "/http[s]?:(\\\\)?\/(\\\\)?\/[^<'\"&?]+\.(" . implode('|', $authorizedMedia) . ")/mi";
         preg_match_all($expr, $xhtml, $mediaList, PREG_PATTERN_ORDER);
 
         $uniqueMediaList = array_unique($mediaList[0]);
@@ -100,9 +116,15 @@ public static function retrieveExternalResources($xhtml, $destination)
 
             $mediaPath = self::retrieveFile($decodedMediaUrl, $destination);
             if (!empty($mediaPath) && $mediaPath !== false) {
-                $xhtml = str_replace($mediaUrl, basename($mediaPath), $xhtml, $replaced); //replace only when copyFile is successful
+                //replace only when copyFile is successful
+                $xhtml = str_replace($mediaUrl, basename($mediaPath), $xhtml, $replaced);
             } else {
-                $report->add(new common_report_Report(common_report_Report::TYPE_ERROR, __('Failed retrieving %s', $decodedMediaUrl)));
+                $report->add(
+                    new common_report_Report(
+                        common_report_Report::TYPE_ERROR,
+                        __('Failed retrieving %s', $decodedMediaUrl)
+                    )
+                );
                 $report->setType(common_report_Report::TYPE_ERROR);
             }
         }
@@ -117,14 +139,16 @@ public static function retrieveExternalResources($xhtml, $destination)
      *
      * @param string $url The URL to be dereferenced.
      * @param string $destination The destination of the retrieved file, on the file system.
-     * @return boolean|string false If an error occurs during the retrieval/copy process, or the final destination name if it succeeds.
+     * @return boolean|string false If an error occurs during the retrieval/copy process, or the final destination name
+     *                        if it succeeds.
      */
     public static function retrieveFile($url, $destination)
     {
 
         $fileName = basename($url);
-        //check file name compatibility:
-        //e.g. if a file with a common name (e.g. car.jpg, house.png, sound.mp3) already exists in the destination folder
+        // check file name compatibility:
+        // e.g. if a file with a common name (e.g. car.jpg, house.png, sound.mp3) already exists in the destination
+        // folder
         while (file_exists($destination . $fileName)) {
             $lastDot = strrpos($fileName, '.');
             $fileName = substr($fileName, 0, $lastDot) . '_' . substr($fileName, $lastDot);
diff --git a/helpers/class.Xhtml.php b/helpers/class.Xhtml.php
index c425a0baa..d1373e262 100644
--- a/helpers/class.Xhtml.php
+++ b/helpers/class.Xhtml.php
@@ -15,10 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 /**
diff --git a/helpers/class.Xslt.php b/helpers/class.Xslt.php
index 7691f19bd..c89526e96 100644
--- a/helpers/class.Xslt.php
+++ b/helpers/class.Xslt.php
@@ -15,10 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 /**
@@ -138,7 +140,10 @@ private static function addParams($dom, $params)
         //registering namespace xsl
         $xpath->registerNamespace(self::XSLT_SHORT_NS, self::XSLT_NS);
         // get the params tag direct child of the stylesheet (don't touch other params as template for example)
-        $items = $xpath->query('/' . self::XSLT_SHORT_NS . ':stylesheet|' . self::XSLT_SHORT_NS . ':transform/' . self::XSLT_SHORT_NS . ':param');
+        $items = $xpath->query(
+            '/' . self::XSLT_SHORT_NS . ':stylesheet|' . self::XSLT_SHORT_NS . ':transform/'
+                . self::XSLT_SHORT_NS . ':param'
+        );
         // list existing to don't duplicate it
         $existing = [];
         foreach ($items as $param) {
@@ -152,7 +157,10 @@ private static function addParams($dom, $params)
                 $node = $dom->createElementNS(self::XSLT_NS, self::XSLT_SHORT_NS . ":param");
                 $node->setAttribute('name', $name);
                 // log to say param added dynamically
-                common_Logger::w('Parameters "' . $name . '"added automatically by the ' . get_class() . ':addParams \'s function because it was missing in the xsl stylesheet');
+                common_Logger::w(
+                    'Parameters "' . $name . '"added automatically by the ' . get_class()
+                        . ':addParams \'s function because it was missing in the xsl stylesheet'
+                );
             }
         }
         return $dom;
diff --git a/includes/constants.php b/includes/constants.php
index d18472cec..e79ee92d1 100755
--- a/includes/constants.php
+++ b/includes/constants.php
@@ -15,13 +15,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
-
 /*
  * @author CRP Henri Tudor - TAO Team - {@link http://www.tao.lu}
  * @license GPLv2  http://www.opensource.org/licenses/gpl-2.0.php
diff --git a/includes/raw_start.php b/includes/raw_start.php
index 2cf9a3166..4ca4cac9d 100644
--- a/includes/raw_start.php
+++ b/includes/raw_start.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
@@ -14,13 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
-?>
-<?php
 
 /**
  * RAW Bootstraping
diff --git a/manifest.php b/manifest.php
index 0596db03f..33c9caab9 100755
--- a/manifest.php
+++ b/manifest.php
@@ -15,9 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  *
  */
 
diff --git a/models/classes/Import/class.ExtractException.php b/models/classes/Import/class.ExtractException.php
index 55e1812b7..4fd1c9ac5 100755
--- a/models/classes/Import/class.ExtractException.php
+++ b/models/classes/Import/class.ExtractException.php
@@ -15,10 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
+
 /**
  * Extract exception during item import
  *
diff --git a/models/classes/Import/class.ImportException.php b/models/classes/Import/class.ImportException.php
index 48ef3a83e..125492357 100755
--- a/models/classes/Import/class.ImportException.php
+++ b/models/classes/Import/class.ImportException.php
@@ -15,10 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
+
 /**
  * Base exception for everything related to item import
  *
diff --git a/models/classes/Import/class.ParsingException.php b/models/classes/Import/class.ParsingException.php
index e7de158da..0dbcd1c93 100755
--- a/models/classes/Import/class.ParsingException.php
+++ b/models/classes/Import/class.ParsingException.php
@@ -15,10 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
+
 /**
  * Parse exception during item import
  *
diff --git a/models/classes/class.CrudItemsService.php b/models/classes/class.CrudItemsService.php
index e28d6675c..a25a29e56 100755
--- a/models/classes/class.CrudItemsService.php
+++ b/models/classes/class.CrudItemsService.php
@@ -74,7 +74,9 @@ public function createFromArray(array $propertiesValues)
             $propertiesValues[OntologyRdfs::RDFS_LABEL] = "";
         }
 
-        $type = isset($propertiesValues[OntologyRdf::RDF_TYPE]) ? $propertiesValues[OntologyRdf::RDF_TYPE] : $this->getRootClass();
+        $type = isset($propertiesValues[OntologyRdf::RDF_TYPE])
+            ? $propertiesValues[OntologyRdf::RDF_TYPE]
+            : $this->getRootClass();
         $label = $propertiesValues[OntologyRdfs::RDFS_LABEL];
         unset($propertiesValues[OntologyRdfs::RDFS_LABEL]);
         unset($propertiesValues[OntologyRdf::RDF_TYPE]);
diff --git a/models/classes/class.ItemCompiler.php b/models/classes/class.ItemCompiler.php
index d000931b1..8ed69fb4e 100755
--- a/models/classes/class.ItemCompiler.php
+++ b/models/classes/class.ItemCompiler.php
@@ -37,7 +37,11 @@ abstract class taoItems_models_classes_ItemCompiler extends tao_models_classes_C
      */
     protected function getContentUsedLanguages()
     {
-        return $this->getResource()->getUsedLanguages(new core_kernel_classes_Property(taoItems_models_classes_ItemsService::PROPERTY_ITEM_CONTENT));
+        return $this
+            ->getResource()
+            ->getUsedLanguages(
+                new core_kernel_classes_Property(taoItems_models_classes_ItemsService::PROPERTY_ITEM_CONTENT)
+            );
     }
 
     /**
@@ -54,7 +58,12 @@ protected function deployItem(core_kernel_classes_Resource $item, $languageCode,
 
         // copy local files
         $sourceDir = $itemService->getItemDirectory($item, $languageCode);
-        $success = taoItems_helpers_Deployment::copyResources($sourceDir->getPrefix(), $compiledDirectory, ['index.html']);
+        $success = taoItems_helpers_Deployment::copyResources(
+            $sourceDir->getPrefix(),
+            $compiledDirectory,
+            ['index.html']
+        );
+
         if (!$success) {
             return $this->fail(__('Unable to copy resources for language %s', $languageCode));
         }
@@ -85,9 +94,13 @@ protected function deployItem(core_kernel_classes_Resource $item, $languageCode,
      * @param tao_models_classes_service_StorageDirectory $destinationDirectory
      * @return tao_models_classes_service_ServiceCall
      */
-    protected function createService(core_kernel_classes_Resource $item, tao_models_classes_service_StorageDirectory $destinationDirectory)
-    {
-        $service = new tao_models_classes_service_ServiceCall(new core_kernel_classes_Resource(taoItems_models_classes_ItemsService::INSTANCE_SERVICE_ITEM_RUNNER));
+    protected function createService(
+        core_kernel_classes_Resource $item,
+        tao_models_classes_service_StorageDirectory $destinationDirectory
+    ) {
+        $service = new tao_models_classes_service_ServiceCall(
+            new core_kernel_classes_Resource(taoItems_models_classes_ItemsService::INSTANCE_SERVICE_ITEM_RUNNER)
+        );
         $service->addInParameter(new tao_models_classes_service_ConstantParameter(
             new core_kernel_classes_Resource(taoItems_models_classes_ItemsService::INSTANCE_FORMAL_PARAM_ITEM_PATH),
             $destinationDirectory->getId()
diff --git a/models/classes/class.ItemExporter.php b/models/classes/class.ItemExporter.php
index bed3dde9c..5be0249ef 100644
--- a/models/classes/class.ItemExporter.php
+++ b/models/classes/class.ItemExporter.php
@@ -15,9 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 /**
@@ -108,7 +109,11 @@ public function setZip(ZipArchive $zip)
     protected function getItemModel()
     {
         try {
-            return $this->getItem()->getUniquePropertyValue(new core_kernel_classes_Property(taoItems_models_classes_ItemsService::PROPERTY_ITEM_MODEL));
+            return $this
+                ->getItem()
+                ->getUniquePropertyValue(
+                    new core_kernel_classes_Property(taoItems_models_classes_ItemsService::PROPERTY_ITEM_MODEL)
+                );
         } catch (common_Exception $e) {
             return null;
         }
@@ -120,8 +125,10 @@ protected function getItemDirectory()
     }
 
     /**
-     * Add files or folders (and their content) to the Zip Archive that will contain all the files to the current export session.
-     * For instance, if you want to copy the file 'taoItems/data/i123/item.xml' as 'myitem.xml' to your archive call addFile('path_to_item_location/item.xml', 'myitem.xml').
+     * Add files or folders (and their content) to the Zip Archive that will contain all the files to the current export
+     * session.
+     * For instance, if you want to copy the file 'taoItems/data/i123/item.xml' as 'myitem.xml' to your archive call
+     * addFile('path_to_item_location/item.xml', 'myitem.xml').
      * As a result, you will get a file entry in the final ZIP archive at '/i123/myitem.xml'.
      *
      * @param string | StreamInterface $src The path to the source file or folder to copy into the ZIP Archive.
diff --git a/models/classes/class.ItemModelException.php b/models/classes/class.ItemModelException.php
index f6b620b53..e96465e97 100644
--- a/models/classes/class.ItemModelException.php
+++ b/models/classes/class.ItemModelException.php
@@ -2,23 +2,24 @@
 
 /*
  * This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; under version 2
-* of the License (non-upgradable).
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*
-* Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
-*               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
-*
-*/
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
+ */
 
 /**
  * An Exception to be thrown when an exception in the context of ItemModel.
diff --git a/models/classes/class.ItemsService.php b/models/classes/class.ItemsService.php
index 49cf0a374..8ee987243 100755
--- a/models/classes/class.ItemsService.php
+++ b/models/classes/class.ItemsService.php
@@ -15,10 +15,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  *               2012-2016 (original work) Open Assessment Technologies SA (under the project TAO-PRODUCT)
- *
  */
 
 use oat\taoItems\model\TaoItemOntology;
@@ -68,7 +69,9 @@ class taoItems_models_classes_ItemsService extends OntologyClassService
 
     public const INSTANCE_FORMAL_PARAM_ITEM_PATH = 'http://www.tao.lu/Ontologies/TAODelivery.rdf#FormalParamItemPath';
 
+    // phpcs:disable Generic.Files.LineLength
     public const INSTANCE_FORMAL_PARAM_ITEM_DATA_PATH = 'http://www.tao.lu/Ontologies/TAODelivery.rdf#FormalParamItemDataPath';
+    // phpcs:enable Generic.Files.LineLength
 
     public const INSTANCE_FORMAL_PARAM_ITEM_URI = 'http://www.tao.lu/Ontologies/TAODelivery.rdf#FormalParamItemUri';
 
@@ -262,7 +265,9 @@ public function getModelRuntime(core_kernel_classes_Resource $item)
         if (!is_null($item)) {
             $itemModel = $item->getOnePropertyValue($this->getItemModelProperty());
             if (!is_null($itemModel)) {
-                $returnValue = $itemModel->getOnePropertyValue($this->getProperty(taoItems_models_classes_itemModel::CLASS_URI_RUNTIME));
+                $returnValue = $itemModel->getOnePropertyValue(
+                    $this->getProperty(taoItems_models_classes_itemModel::CLASS_URI_RUNTIME)
+                );
             }
         }
 
@@ -289,7 +294,10 @@ public function hasModelStatus(core_kernel_classes_Resource $item, $status)
             try {
                 $itemModel = $item->getOnePropertyValue($this->getItemModelProperty());
                 if ($itemModel instanceof core_kernel_classes_Resource) {
-                    $itemModelStatus = $itemModel->getUniquePropertyValue($this->getProperty(ItemModelStatus::CLASS_URI));
+                    $itemModelStatus = $itemModel->getUniquePropertyValue(
+                        $this->getProperty(ItemModelStatus::CLASS_URI)
+                    );
+
                     if (in_array($itemModelStatus->getUri(), $status)) {
                         $returnValue = true;
                     }
@@ -339,8 +347,11 @@ public function composeItemDirectoryPath(string $itemContentDirectoryName, strin
      * (non-PHPdoc)
      * @see tao_models_classes_GenerisService::cloneInstanceProperty()
      */
-    protected function cloneInstanceProperty(core_kernel_classes_Resource $source, core_kernel_classes_Resource $destination, core_kernel_classes_Property $property)
-    {
+    protected function cloneInstanceProperty(
+        core_kernel_classes_Resource $source,
+        core_kernel_classes_Resource $destination,
+        core_kernel_classes_Property $property
+    ) {
         if ($property->getUri() == self::PROPERTY_ITEM_CONTENT) {
             return $this->cloneItemContent($source, $destination, $property);
         } else {
@@ -370,9 +381,12 @@ protected function cloneItemContent(
         foreach ($source->getUsedLanguages($this->getItemContentProperty()) as $lang) {
             $sourceItemDirectory = $this->getItemDirectory($source, $lang);
             $destinationItemDirectory = $this->getItemDirectory($destination, $lang);
+            $propertyValuesCollection = $source->getPropertyValuesCollection($property, ['lg' => $lang]);
 
-            foreach ($source->getPropertyValuesCollection($property, ['lg' => $lang])->getIterator() as $propertyValue) {
-                $id = $propertyValue instanceof core_kernel_classes_Resource ? $propertyValue->getUri() : (string)$propertyValue;
+            foreach ($propertyValuesCollection->getIterator() as $propertyValue) {
+                $id = $propertyValue instanceof core_kernel_classes_Resource
+                    ? $propertyValue->getUri()
+                    : (string)$propertyValue;
                 $sourceDirectory = $serializer->unserializeDirectory($id);
                 $iterator = $sourceDirectory->getFlyIterator(Directory::ITERATOR_FILE | Directory::ITERATOR_RECURSIVE);
 
@@ -381,7 +395,9 @@ protected function cloneItemContent(
                     $newFile->write($iteratorFile->readStream());
                 }
 
-                $destinationDirectory = $destinationItemDirectory->getDirectory($sourceItemDirectory->getRelPath($sourceDirectory));
+                $destinationDirectory = $destinationItemDirectory->getDirectory(
+                    $sourceItemDirectory->getRelPath($sourceDirectory)
+                );
                 $serializer->serialize($destinationDirectory);
             }
         }
@@ -512,7 +528,9 @@ public function getItemModelImplementation(core_kernel_classes_Resource $itemMod
     {
         $serviceId = (string)$itemModel->getOnePropertyValue($this->getProperty(self::PROPERTY_ITEM_MODEL_SERVICE));
         if (empty($serviceId)) {
-            throw new common_exception_NoImplementation('No implementation found for item model ' . $itemModel->getUri());
+            throw new common_exception_NoImplementation(
+                'No implementation found for item model ' . $itemModel->getUri()
+            );
         }
         try {
             $itemModelService = $this->getServiceManager()->get($serviceId);
@@ -525,7 +543,9 @@ public function getItemModelImplementation(core_kernel_classes_Resource $itemMod
             $itemModelService = new $serviceId();
         }
         if (!$itemModelService instanceof taoItems_models_classes_itemModel) {
-            throw new common_exception_Error('Item model service ' . get_class($itemModelService) . ' not compatible for item model ' . $serviceId);
+            throw new common_exception_Error(
+                'Item model service ' . get_class($itemModelService) . ' not compatible for item model ' . $serviceId
+            );
         }
 
         return $itemModelService;
diff --git a/models/classes/class.TemplateRenderer.php b/models/classes/class.TemplateRenderer.php
index 4649c6215..ed195a144 100644
--- a/models/classes/class.TemplateRenderer.php
+++ b/models/classes/class.TemplateRenderer.php
@@ -15,9 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 /**
diff --git a/models/classes/exporter/class.DefaultItemExporter.php b/models/classes/exporter/class.DefaultItemExporter.php
index 00416b65a..16101f118 100644
--- a/models/classes/exporter/class.DefaultItemExporter.php
+++ b/models/classes/exporter/class.DefaultItemExporter.php
@@ -15,8 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  *               2012-2016 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  */
 
diff --git a/models/classes/interface.ExportableItemModel.php b/models/classes/interface.ExportableItemModel.php
index efe1fcc25..0d5ebdbd7 100755
--- a/models/classes/interface.ExportableItemModel.php
+++ b/models/classes/interface.ExportableItemModel.php
@@ -15,9 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 /**
diff --git a/models/classes/interface.ImportableItemModel.php b/models/classes/interface.ImportableItemModel.php
index e51c39ff3..5def56fc7 100755
--- a/models/classes/interface.ImportableItemModel.php
+++ b/models/classes/interface.ImportableItemModel.php
@@ -15,9 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 /**
diff --git a/models/classes/interface.itemModel.php b/models/classes/interface.itemModel.php
index 5093414b9..e33484356 100755
--- a/models/classes/interface.itemModel.php
+++ b/models/classes/interface.itemModel.php
@@ -15,13 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  *               2013 (update and modification) Open Assessment Technologies SA (under the project TAO-PRODUCT);
- *
  */
 
-
 /**
  * Interface to implement by item models
  *
diff --git a/models/classes/pack/ItemPack.php b/models/classes/pack/ItemPack.php
index b45b8484e..59b474149 100644
--- a/models/classes/pack/ItemPack.php
+++ b/models/classes/pack/ItemPack.php
@@ -213,6 +213,8 @@ public function getAssets(string $type): array
 
     /**
      * How to serialize the pack in JSON.
+     *
+     * phpcs:disable PSR1.Methods.CamelCapsMethodName
      */
     public function JsonSerialize()
     {
@@ -222,6 +224,7 @@ public function JsonSerialize()
             'assets'    => $this->assets
         ];
     }
+    // phpcs:enable PSR1.Methods.CamelCapsMethodName
 
     /**
      * @return array
diff --git a/scripts/install/CreateItemDirectory.php b/scripts/install/CreateItemDirectory.php
index 62ee5552d..bf3a30935 100644
--- a/scripts/install/CreateItemDirectory.php
+++ b/scripts/install/CreateItemDirectory.php
@@ -15,9 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  *               2016 (update and modification) Open Assessment Technologies SA;
  */
 
diff --git a/scripts/update/class.Updater.php b/scripts/update/class.Updater.php
index c50129c3b..385548206 100644
--- a/scripts/update/class.Updater.php
+++ b/scripts/update/class.Updater.php
@@ -48,7 +48,9 @@ public function update($initialVersion)
 
 
         if ($this->isBetween('0.0.0', '2.8.0')) {
-            throw new common_exception_NotImplemented('Updates from versions prior to Tao 3.1 are not longer supported, please update to Tao 3.1 first');
+            throw new common_exception_NotImplemented(
+                'Updates from versions prior to Tao 3.1 are not longer supported, please update to Tao 3.1 first'
+            );
         }
 
         $this->skip('2.8.1', '2.22.3');
@@ -79,8 +81,26 @@ public function update($initialVersion)
         $this->skip('5.6.0', '5.9.0');
 
         if ($this->isVersion('5.9.0')) {
-            AclProxy::applyRule(new AccessRule('grant', TaoRoles::REST_PUBLISHER, ['ext' => 'taoItems', 'mod' => 'RestItems']));
-            AclProxy::applyRule(new AccessRule('grant', TaoRoles::REST_PUBLISHER, ['ext' => 'taoItems', 'mod' => 'RestFormItem']));
+            AclProxy::applyRule(
+                new AccessRule(
+                    'grant',
+                    TaoRoles::REST_PUBLISHER,
+                    [
+                        'ext' => 'taoItems',
+                        'mod' => 'RestItems',
+                    ]
+                )
+            );
+            AclProxy::applyRule(
+                new AccessRule(
+                    'grant',
+                    TaoRoles::REST_PUBLISHER,
+                    [
+                        'ext' => 'taoItems',
+                        'mod' => 'RestFormItem',
+                    ]
+                )
+            );
             $this->setVersion('5.10.0');
         }
 
diff --git a/test/integration/ItemsTest.php b/test/integration/ItemsTest.php
index 6fa245819..baf0aff4b 100644
--- a/test/integration/ItemsTest.php
+++ b/test/integration/ItemsTest.php
@@ -15,8 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  *               2016 (update and modification) Open Assessment Technologies SA
  */
 
@@ -232,7 +234,10 @@ public function testGetPreviewUrl()
         $item = $this->prophesize('core_kernel_classes_Resource');
         $itemModelProphecy = $this->prophesize('core_kernel_classes_Resource');
 
-        $itemModelProphecy->getPropertyValues($this->createTestProperty(taoItems_models_classes_ItemsService::PROPERTY_ITEM_MODEL_SERVICE))
+        $itemModelProphecy
+            ->getPropertyValues(
+                $this->createTestProperty(taoItems_models_classes_ItemsService::PROPERTY_ITEM_MODEL_SERVICE)
+            )
             ->willReturn([]);
 
         $this->assertNull($this->itemsService->getPreviewUrl($item->reveal()));
diff --git a/test/integration/XhtmlTest.php b/test/integration/XhtmlTest.php
index 0ae3e3f87..199b93928 100644
--- a/test/integration/XhtmlTest.php
+++ b/test/integration/XhtmlTest.php
@@ -2,23 +2,24 @@
 
 /*
  * This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; under version 2
-* of the License (non-upgradable).
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*
-* Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
-*               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
-*
-*/
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
+ */
 
 namespace oat\taoItems\test\integration;
 
@@ -39,7 +40,9 @@ class XhtmlTestCase extends TestCase
 {
     public function testGetScriptElements()
     {
-        $file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'xhtml' . DIRECTORY_SEPARATOR . 'raw.html';
+        $file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'xhtml'
+            . DIRECTORY_SEPARATOR . 'raw.html';
+
         try {
             $dom = new DOMDocument('1.0', TAO_DEFAULT_ENCODING);
             if (@$dom->load($file)) {
@@ -55,7 +58,9 @@ public function testGetScriptElements()
 
     public function testHasScriptElements()
     {
-        $file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'xhtml' . DIRECTORY_SEPARATOR . 'raw.html';
+        $file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'xhtml'
+            . DIRECTORY_SEPARATOR . 'raw.html';
+
         try {
             $dom = new DOMDocument('1.0', TAO_DEFAULT_ENCODING);
             if (@$dom->load($file)) {
@@ -71,7 +76,9 @@ public function testHasScriptElements()
 
     public function testRemoveScriptElements()
     {
-        $file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'xhtml' . DIRECTORY_SEPARATOR . 'raw.html';
+        $file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'xhtml'
+            . DIRECTORY_SEPARATOR . 'raw.html';
+
         try {
             $dom = new DOMDocument('1.0', TAO_DEFAULT_ENCODING);
             if (@$dom->load($file)) {
@@ -87,7 +94,9 @@ public function testRemoveScriptElements()
 
     public function testAddScriptElement()
     {
-        $file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'xhtml' . DIRECTORY_SEPARATOR . 'raw.html';
+        $file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'xhtml'
+            . DIRECTORY_SEPARATOR . 'raw.html';
+
         try {
             $dom = new DOMDocument('1.0', TAO_DEFAULT_ENCODING);
             if (@$dom->load($file)) {
@@ -106,7 +115,11 @@ public function testAddScriptElement()
                 }
 
                 // -- Prepend
-                taoItems_helpers_Xhtml::addScriptElement($dom, 'http://www.taotesting.com/scripts/wfapi.min.js', $append = false);
+                taoItems_helpers_Xhtml::addScriptElement(
+                    $dom,
+                    'http://www.taotesting.com/scripts/wfapi.min.js',
+                    $append = false
+                );
                 $addedElements = taoItems_helpers_Xhtml::getScriptElements($dom, '/wfapi\.min/');
                 $this->assertEquals(1, count($addedElements));
                 $added = $addedElements[0];
diff --git a/test/integration/media/LocalItemSourceTest.php b/test/integration/media/LocalItemSourceTest.php
index d53ea0564..e16bac449 100644
--- a/test/integration/media/LocalItemSourceTest.php
+++ b/test/integration/media/LocalItemSourceTest.php
@@ -92,7 +92,8 @@ protected function getMediaAsset()
 
     protected function getSampleFile()
     {
-        return dirname(__DIR__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'asset' . DIRECTORY_SEPARATOR . 'sample.css';
+        return dirname(__DIR__) . DIRECTORY_SEPARATOR . 'samples' . DIRECTORY_SEPARATOR . 'asset'
+            . DIRECTORY_SEPARATOR . 'sample.css';
     }
 
     protected function getLocalItemSource()
diff --git a/test/integration/taoApiServer.php b/test/integration/taoApiServer.php
index 3988451c4..08ae77f74 100644
--- a/test/integration/taoApiServer.php
+++ b/test/integration/taoApiServer.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
@@ -14,21 +15,28 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
-?>
-<?php
 
 switch ($_GET['action']) {
     case 'push':
-        (isset($_POST['token'])) ? ($_POST['token'] == '7114e56cb3b9423314a425500afb41fc56183000') ? $saved = true : $saved = false : $saved = false;
+        (isset($_POST['token']))
+            ? ($_POST['token'] == '7114e56cb3b9423314a425500afb41fc56183000')
+                ? $saved = true
+                : $saved = false
+            : $saved = false;
         echo json_encode(['saved' => $saved]);
         break;
 
     case 'traceEvents':
-        (isset($_POST['token'])) ? ($_POST['token'] == '7114e56cb3b9423314a425500afb41fc56183000') ? $saved = true : $saved = false : $saved = false;
+        (isset($_POST['token']))
+            ? ($_POST['token'] == '7114e56cb3b9423314a425500afb41fc56183000')
+                ? $saved = true
+                : $saved = false
+            : $saved = false;
         if ($saved) {
             if ($saved = $saved && isset($_POST['events'])) {
                 $saved = $saved && count($_POST['events']) > 0;
diff --git a/test/unit/XmlItemContentTokenizerTest.php b/test/unit/XmlItemContentTokenizerTest.php
index 47e075a65..c6c631bd3 100644
--- a/test/unit/XmlItemContentTokenizerTest.php
+++ b/test/unit/XmlItemContentTokenizerTest.php
@@ -15,9 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 namespace oat\taoItems\test\unit;
diff --git a/test/unit/models/classes/CategoryServiceTest.php b/test/unit/models/classes/CategoryServiceTest.php
index c82897714..90eaaaa23 100644
--- a/test/unit/models/classes/CategoryServiceTest.php
+++ b/test/unit/models/classes/CategoryServiceTest.php
@@ -79,13 +79,19 @@ public function testDoesExpose()
         //prop value is GenerisRdf::GENERIS_FALSE
         $propProphecy = $this->prophesize('\core_kernel_classes_Property');
         $propProphecy->getOnePropertyValue($exposeProperty)->willReturn($falseResource);
-        $this->assertFalse($categoryService->doesExposeCategory($propProphecy->reveal()), 'The property is not exposed');
+        $this->assertFalse(
+            $categoryService->doesExposeCategory($propProphecy->reveal()),
+            'The property is not exposed'
+        );
 
         //no prop value
         $propProphecy = $this->prophesize('\core_kernel_classes_Property');
         $propProphecy->getOnePropertyValue($exposeProperty)->willReturn(null);
 
-        $this->assertFalse($categoryService->doesExposeCategory($propProphecy->reveal()), 'The property is not exposed');
+        $this->assertFalse(
+            $categoryService->doesExposeCategory($propProphecy->reveal()),
+            'The property is not exposed'
+        );
     }
 
     /**
@@ -108,7 +114,9 @@ public function testGetElligibleProperties()
         $notEligibleProp1->getUri()->willReturn('np1');
 
         $notEligibleProp2 = $this->prophesize('\core_kernel_classes_Property');
-        $notEligibleProp2->getWidget()->willReturn(new RdfResource('http://www.tao.lu/datatypes/WidgetDefinitions.rdf#HtmlBox'));
+        $notEligibleProp2
+            ->getWidget()
+            ->willReturn(new RdfResource('http://www.tao.lu/datatypes/WidgetDefinitions.rdf#HtmlBox'));
         $notEligibleProp2->getUri()->willReturn('np2');
 
         $excludedProp1 = $this->prophesize('\core_kernel_classes_Property');
diff --git a/test/unit/pack/ItemPackTest.php b/test/unit/pack/ItemPackTest.php
index 3d352298e..8ce489d78 100644
--- a/test/unit/pack/ItemPackTest.php
+++ b/test/unit/pack/ItemPackTest.php
@@ -37,7 +37,48 @@
  */
 class ItemPackTest extends TestCase
 {
-    private const ENCODED_IMAGE = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD//gA+Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBkZWZhdWx0IHF1YWxpdHkK/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgBLAEsAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A8BwMkc/lSUd6WgA70lH50vTGKADrk0E55xR6DnFJQAvOOOlIe9L60lACkk9eaKOnSkoAKKKKAAZ9KOlH0pQMkDI59aAENHGP/r0UUAFFJRQAtGKKSgApeh7UUUAJS8UdqB70AFGBxzQODR1NAAKSil44zQAUUDqM0UAFFFFABRQCR0JooAKSlI9waSgBcYOMjmlwT0FJ+NFABRRS9qAA+3Sj0oBAPIH40dqAEzQaKKAFpOM80v0pPxoAKKKKACiiigA780HHYYo7ZooAMUUUH6UAFJRS0AHakpSSSSTz70lABS44oooAMnrQATwB+VJS0AFFJ1ooAXjPFFJRQAveiijtQAUUUUAB70UUUAGOnpRSUtACUtFAI9BQAUtJnnmigApeo9qTrS0AGc9zj0oGD3xSd6KACl+vFFJjgHNAC8DpSfjS0H19aAEo9aD0HSjGT0oAKKDRjrQAGgikpaAEpfaiigA7e9FHal4AI6nPUdKAEooooAKKKPpQAUlLRQAUDikpSSSSSST1JoAKKSl+lABR296KKAAnPbFJS0UAGOM0lKPwooAKKSloAKM0uSRtycZ4FJx6UAFFFLigAPWkzRQCcYzx1xQAuDjNJS8gUlAC4IJFJg49qKKACiijpQAUUe9AzzQAUGiigBKKWkoAUnIHHSiig5oASlyRnBIyMGkooAKKWkoAU9aKSl9qADNJ3pcn8+tGCQcDgdaAAEY59OKBRRQAE5oo/CkoAUZHIo70Y5pKAFoxn3pKKAFPNFFFABR2xRR2oAPrRRxS4z0oADnPOc0lFFAC9e1JR+NHegAoo9aKACg9ulHHPU0dzxj2oAWkPWiigAoNFOSNpSQgyQCx+gHNADKXJwBniiigBKKWkoAWiikoAKU+vakpaACigY70d6AEopaQ0AFLR2pKAFNJS0dvegA6UuRsA2jIJOecn2/z60lJQAtJS0lABS5x6UcdO9FABS0nvS8jtQAnAPrS8baO/FIPWgBeB9aQ0pBU4P15pACaACilpDQAflTpH3SFtgTJyFXoKbRQAUUuOcDn6UlABQRgc8e1FFABRRQTk5oACMEg9vSikpfwoAMY60lLxikoAKWkooAKKKWgApKPpS0AJRS8npSUALSUuKKACkpelFAB096BzSUUALRQKKAEpaSloAMUfyopRycZwKAEoGRyDz7UUpPA4HHegAyc89qSiigBecUlL2pKACiiigAo70dqPb9aAAdx60UUUAFFHeg0AFJRS0AFHrR1+tJQAtFHejtQAdqSlpKAFpKXNFABSUtHrQAY7Gjt1o70UAFGOOlBooAKKKKAEpaKD1oASnKCRxj8SKT8aKADvRR3ooAKKM0UAKeTx3pO1HGaKAFOMkgEDsKSijigBcn0pM5NGKKAHMmxiu5TjuDkU3uaMUd+KAAdDzz2oFFKKAEoooNABn9aSilH1oAKSlNJQApyDg5B70UD6UUAJSk80lFADkUu6rkDJxknA/E0lFFABQevNFJQAtJS0UAFFFFABRjj/wCvRRQAUAe1FFACUtJS0ABPNL25pD1ooAPfijpRSgjIyMj0oAD9McdqSilBxQAlL79Pajmk59aAFxgDP5UlHbmigA49KDRRQADHeiigUAFGKKOlAAeSeMUlLSUALR2opM0ALRSUUALSUUUAL1opKWgA96KO1HH0oAKSlHT3oHWgA7d6DR3ooAKKO1HH+FABnrx1oopKAFPU4oAz/wDroooAKO1Hc0CgAoope1ACUEmlwPWkx9aAF7dKSl5xjPFJQAdulAznjrR2ooABRR2ooAKO1FHagAoNHb3oIx1oASlpKWgA9KSlpKAFzxRSUuaAEpaKKACjNFJQAvSjPFJS4oABRRRQAc55HNGaKXaduevt6UAJR24P1FGetGMcHrQAUlLQKACjijilBI6EigBDjPFKDg8daQ0UAFFLx+NIKAFJGcgUlKaSgBTgAYz054pKKWgBKPrQevFHagAooxxmgjFABRj6UGigAPHHFHXpRR1oASilpKAFpKWkoAWigdeaKADiiikoAWkpeMe9JQAtJSj1pKAClooznrQAE0HrRxRQAUe/eiigA70dKKMfSgANFBAoOM8dKADvS59qTvQKAFopMUUAHej60uTnOM89D3pM0ALzg4zgCgknAJOB0o/Gg4zjI+tAB/OkpcEjNJQAUY6e/NGaKAA0HknoPaijORQAUpBxnHA4Jx0pDQelABSUUtABSUtJQAvejt0oFFAB069aOv1o69BQaACj6UUDjmgAFFFJQAuaSiigBaKSigApaDnjOaKAE7UtGKSgAopaKACjiigGgAzil69BSE5NHGOlACjGeelIR9ac2BlRtbB+8M802gA7UZopQf8A9dACUH2oo7UAB6+lB9qB160UAFLxgYJzjnNJR2oAM8UUUlABS/hSUtAASScmkpT9MUlABS0lKRgmgANJS+3NHTHvQAUZ5zRSUAFFFL/OgAooAycD9aSgBaKKO9AACAwJAI9PWijtRigA7UlFLQAfWig9qCMHBByOtACk5x0o+8RgYpD1PSigBSxPfp0HpR3zzRn3pP0oAO/FFHeigBaSijrQAdu+aBjNLSUAFB60UUAFFFFAB+GaUsWABJOBge1J19qSgApaKSgBcnpmjtR2pKAFooooASijtRQAUUueP/rUlAC0lL3ooAP5UdTSUtABRRRQAUlLyeaKAEpaKSgApcH0NJS0AHGeKOgFGMngGjHvQAuPSko7dqKADviig4zxRQAUUp4yKSgA7UUYooAPwoo46frRQAUDr0o6UUAH5UUUlABRS8YHJz6YpKAFpKKKAClzSUtACUUUtABRRRQAetJRRQAtFAooAKPag0YoASilAyccc0lACgUlLQKADvR+NJSgUAKoywycDOMntQKTvRQAd6XjFAODkUnagBc0nrSk/LjjAPp6/wD6qSgAoxR0ooAO1HFFFAB+NGPeijHWgA60UUAE8Dk0AHbpQaKMUAJRRRQAUvIPoRRSUALRRRQAUdDRSUAFFLRQAUHHXIoooABijFFJQAvJo4I96KKAAUUUlACgcHPGBnnvSUUuOKACiiigAopSpAzg4PQ460CgBKXtg8UfTpSflQAtJS44zSdqADrRSgrg5B6cc0nWgAoo7d6DQAZ5yefrRRRQAZ5oo5Pajv1oAKKPWigBKKKKACilpKAF7UAc4AyelFFACU48HGMYptLQAlFKKSgBaSiigBR19u+KKKOtABRR+FBxk4JI7ZoAKKO1HGKADtRSUpoASlz/AJzSUtABg4zg46Zo/SgkH60o6UAAAzyeKSijtQAo65zzSUH1ooAKKO1FAC/nR0H/ANekooAOpooo56ZoAD+FFGKKACg0YooASiinADcN3APXHOPwoATt1pKWkoAKWkpSScZJOOBmgBKWgdaO4oAOPxoooFABSGlJz2xRQAUlLRxmgA78UUEHGccHpxSUALxSUtBOfwoAKSlooASlCkjgE0UUAFLjNJ3ooAPxo7UdqM0ABHtQBwaOhooAKKOxoHNABQaU9KT2oAOxo7HkU4AGMt3BA/nTT1oAKKO9BoAKXkjgUlB6UAJRRT3UKFx3Gf1IoAbRSU5VBGfcCgBKSilNABRRj5sUUAGaASCCDgjoaDwaSgApTjAwSeOeOlJS5oAB1oo70AfKTQAE5ycUdTzSUZoAKWjHFJQAtFJRQAtAJHr+dB6migD/2Q==';
+    private const ENCODED_IMAGE = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD//gA+Q1JFQVRPUjogZ2QtanBlZyB2MS4wI'
+        . 'Ch1c2luZyBJSkcgSlBFRyB2NjIpLCBkZWZhdWx0IHF1YWxpdHkK/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJ'
+    . 'yAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyM'
+    . 'jIyMjIyMjIyMjIy/8AAEQgBLAEsAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABf'
+    . 'QECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0d'
+    . 'XZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BA'
+    . 'AMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0'
+    . 'QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKzt'
+    . 'LW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A8BwMkc/lSUd6WgA70lH50vTGKADrk0E55xR6D'
+    . 'nFJQAvOOOlIe9L60lACkk9eaKOnSkoAKKKKAAZ9KOlH0pQMkDI59aAENHGP/r0UUAFFJRQAtGKKSgApeh7UUUAJS8UdqB70AFGBxzQODR1NAAKSi'
+    . 'l44zQAUUDqM0UAFFFFABRQCR0JooAKSlI9waSgBcYOMjmlwT0FJ+NFABRRS9qAA+3Sj0oBAPIH40dqAEzQaKKAFpOM80v0pPxoAKKKKACiiigA78'
+    . '0HHYYo7ZooAMUUUH6UAFJRS0AHakpSSSSTz70lABS44oooAMnrQATwB+VJS0AFFJ1ooAXjPFFJRQAveiijtQAUUUUAB70UUUAGOnpRSUtACUtFAI'
+    . '9BQAUtJnnmigApeo9qTrS0AGc9zj0oGD3xSd6KACl+vFFJjgHNAC8DpSfjS0H19aAEo9aD0HSjGT0oAKKDRjrQAGgikpaAEpfaiigA7e9FHal4AI'
+    . '6nPUdKAEooooAKKKPpQAUlLRQAUDikpSSSSSST1JoAKKSl+lABR296KKAAnPbFJS0UAGOM0lKPwooAKKSloAKM0uSRtycZ4FJx6UAFFFLigAPWkz'
+    . 'RQCcYzx1xQAuDjNJS8gUlAC4IJFJg49qKKACiijpQAUUe9AzzQAUGiigBKKWkoAUnIHHSiig5oASlyRnBIyMGkooAKKWkoAU9aKSl9qADNJ3pcn8'
+    . '+tGCQcDgdaAAEY59OKBRRQAE5oo/CkoAUZHIo70Y5pKAFoxn3pKKAFPNFFFABR2xRR2oAPrRRxS4z0oADnPOc0lFFAC9e1JR+NHegAoo9aKACg9u'
+    . 'lHHPU0dzxj2oAWkPWiigAoNFOSNpSQgyQCx+gHNADKXJwBniiigBKKWkoAWiikoAKU+vakpaACigY70d6AEopaQ0AFLR2pKAFNJS0dvegA6UuRsA'
+    . '2jIJOecn2/z60lJQAtJS0lABS5x6UcdO9FABS0nvS8jtQAnAPrS8baO/FIPWgBeB9aQ0pBU4P15pACaACilpDQAflTpH3SFtgTJyFXoKbRQAUUuO'
+    . 'cDn6UlABQRgc8e1FFABRRQTk5oACMEg9vSikpfwoAMY60lLxikoAKWkooAKKKWgApKPpS0AJRS8npSUALSUuKKACkpelFAB096BzSUUALRQKKAEp'
+    . 'aSloAMUfyopRycZwKAEoGRyDz7UUpPA4HHegAyc89qSiigBecUlL2pKACiiigAo70dqPb9aAAdx60UUUAFFHeg0AFJRS0AFHrR1+tJQAtFHejtQA'
+    . 'dqSlpKAFpKXNFABSUtHrQAY7Gjt1o70UAFGOOlBooAKKKKAEpaKD1oASnKCRxj8SKT8aKADvRR3ooAKKM0UAKeTx3pO1HGaKAFOMkgEDsKSijigB'
+    . 'cn0pM5NGKKAHMmxiu5TjuDkU3uaMUd+KAAdDzz2oFFKKAEoooNABn9aSilH1oAKSlNJQApyDg5B70UD6UUAJSk80lFADkUu6rkDJxknA/E0lFFAB'
+    . 'QevNFJQAtJS0UAFFFFABRjj/wCvRRQAUAe1FFACUtJS0ABPNL25pD1ooAPfijpRSgjIyMj0oAD9McdqSilBxQAlL79Pajmk59aAFxgDP5UlHbmig'
+    . 'A49KDRRQADHeiigUAFGKKOlAAeSeMUlLSUALR2opM0ALRSUUALSUUUAL1opKWgA96KO1HH0oAKSlHT3oHWgA7d6DR3ooAKKO1HH+FABnrx1oopKA'
+    . 'FPU4oAz/wDroooAKO1Hc0CgAoope1ACUEmlwPWkx9aAF7dKSl5xjPFJQAdulAznjrR2ooABRR2ooAKO1FHagAoNHb3oIx1oASlpKWgA9KSlpKAFz'
+    . 'xRSUuaAEpaKKACjNFJQAvSjPFJS4oABRRRQAc55HNGaKXaduevt6UAJR24P1FGetGMcHrQAUlLQKACjijilBI6EigBDjPFKDg8daQ0UAFFLx+NIK'
+    . 'AFJGcgUlKaSgBTgAYz054pKKWgBKPrQevFHagAooxxmgjFABRj6UGigAPHHFHXpRR1oASilpKAFpKWkoAWigdeaKADiiikoAWkpeMe9JQAtJSj1p'
+    . 'KAClooznrQAE0HrRxRQAUe/eiigA70dKKMfSgANFBAoOM8dKADvS59qTvQKAFopMUUAHej60uTnOM89D3pM0ALzg4zgCgknAJOB0o/Gg4zjI+tAB'
+    . '/OkpcEjNJQAUY6e/NGaKAA0HknoPaijORQAUpBxnHA4Jx0pDQelABSUUtABSUtJQAvejt0oFFAB069aOv1o69BQaACj6UUDjmgAFFFJQAuaSiigB'
+    . 'aKSigApaDnjOaKAE7UtGKSgAopaKACjiigGgAzil69BSE5NHGOlACjGeelIR9ac2BlRtbB+8M802gA7UZopQf8A9dACUH2oo7UAB6+lB9qB160UA'
+    . 'FLxgYJzjnNJR2oAM8UUUlABS/hSUtAASScmkpT9MUlABS0lKRgmgANJS+3NHTHvQAUZ5zRSUAFFFL/OgAooAycD9aSgBaKKO9AACAwJAI9PWijtR'
+    . 'igA7UlFLQAfWig9qCMHBByOtACk5x0o+8RgYpD1PSigBSxPfp0HpR3zzRn3pP0oAO/FFHeigBaSijrQAdu+aBjNLSUAFB60UUAFFFFAB+GaUsWAB'
+    . 'JOBge1J19qSgApaKSgBcnpmjtR2pKAFooooASijtRQAUUueP/rUlAC0lL3ooAP5UdTSUtABRRRQAUlLyeaKAEpaKSgApcH0NJS0AHGeKOgFGMngG'
+    . 'jHvQAuPSko7dqKADviig4zxRQAUUp4yKSgA7UUYooAPwoo46frRQAUDr0o6UUAH5UUUlABRS8YHJz6YpKAFpKKKAClzSUtACUUUtABRRRQAetJRR'
+    . 'QAtFAooAKPag0YoASilAyccc0lACgUlLQKADvR+NJSgUAKoywycDOMntQKTvRQAd6XjFAODkUnagBc0nrSk/LjjAPp6/wD6qSgAoxR0ooAO1HFFF'
+    . 'AB+NGPeijHWgA60UUAE8Dk0AHbpQaKMUAJRRRQAUvIPoRRSUALRRRQAUdDRSUAFFLRQAUHHXIoooABijFFJQAvJo4I96KKAAUUUlACgcHPGBnnvS'
+    . 'UUuOKACiiigAopSpAzg4PQ460CgBKXtg8UfTpSflQAtJS44zSdqADrRSgrg5B6cc0nWgAoo7d6DQAZ5yefrRRRQAZ5oo5Pajv1oAKKPWigBKKKKA'
+    . 'CilpKAF7UAc4AyelFFACU48HGMYptLQAlFKKSgBaSiigBR19u+KKKOtABRR+FBxk4JI7ZoAKKO1HGKADtRSUpoASlz/AJzSUtABg4zg46Zo/SgkH'
+    . '60o6UAAAzyeKSijtQAo65zzSUH1ooAKKO1FAC/nR0H/ANekooAOpooo56ZoAD+FFGKKACg0YooASiinADcN3APXHOPwoATt1pKWkoAKWkpSScZJO'
+    . 'OBmgBKWgdaO4oAOPxoooFABSGlJz2xRQAUlLRxmgA78UUEHGccHpxSUALxSUtBOfwoAKSlooASlCkjgE0UUAFLjNJ3ooAPxo7UdqM0ABHtQBwaOh'
+    . 'ooAKKOxoHNABQaU9KT2oAOxo7HkU4AGMt3BA/nTT1oAKKO9BoAKXkjgUlB6UAJRRT3UKFx3Gf1IoAbRSU5VBGfcCgBKSilNABRRj5sUUAGaASCCD'
+    . 'gjoaDwaSgApTjAwSeOeOlJS5oAB1oo70AfKTQAE5ycUdTzSUZoAKWjHFJQAtFJRQAtAJHr+dB6migD/2Q==';
 
     /**
      * Test creating an ItemPack
@@ -186,7 +227,20 @@ public function jsonSerializableProvider()
             'lodash.js',
             'jquery.js'
         ]);
-        $json2 = '{"type":"owi","data":{"foo":"bar"},"assets":{"js":{"lodash.js":"lodash.js","jquery.js":"jquery.js"}}}';
+        $json2 = json_encode(
+            [
+                'type' => 'owi',
+                'data' => [
+                    'foo' => 'bar',
+                ],
+                'assets' => [
+                    'js' => [
+                        'lodash.js' => 'lodash.js',
+                        'jquery.js' => 'jquery.js',
+                    ],
+                ],
+            ]
+        );
         $data[1] = [$pack2, $json2];
 
         return $data;