[FEATURE] Downgrade to TYPO3 6.2

helhum · Sep 13, 2018 · ad38e5f · ad38e5f
1 parent cbc9758
commit ad38e5f
Show file tree

Hide file tree

Showing 18 changed files with 77 additions and 184 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -17,14 +17,13 @@ return PhpCsFixer\Config::create()
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => [
-            'syntax' => 'short',
+            'syntax' => 'long',
         ],
         'binary_operator_spaces' => true,
         'blank_line_before_return' => true,
         'concat_space' => [
             'spacing' => 'one',
         ],
-        'declare_strict_types' => true,
         'function_typehint_space' => true,
         'hash_to_slash_comment' => true,
         'linebreak_after_opening_tag' => true,

diff --git a/.styleci.yml b/.styleci.yml
@@ -8,6 +8,7 @@ enabled:
   - function_typehint_space
   - hash_to_slash_comment
   - linebreak_after_opening_tag
+  - long_array_syntax
   - lowercase_cast
   - method_separation
   - native_function_casing
@@ -52,7 +53,6 @@ enabled:
   - phpdoc_var_without_name
   - return_type_declaration
   - self_accessor
-  - short_array_syntax
   - short_scalar_cast
   - single_quote
   - standardize_not_equals

diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,7 @@ install:
       composer config prefer-stable true;
       composer require typo3/cms-core:"@dev" --no-update;
     fi
-  - composer require nimut/typo3-complete:"$TYPO3"
+  - composer require typo3/cms:"$TYPO3"
   - mkdir -p .Build/public/typo3conf/ext/
   - if [ ! -L .Build/public/typo3conf/ext/filefill ]; then ln -snvf ../../../../. .Build/public/typo3conf/ext/filefill; fi
   - export TYPO3_PATH_ROOT=$PWD/.Build/public
@@ -68,105 +68,16 @@ script:
 jobs:
   fast_finish: true
   include:
-    - stage: test
-      php: 7.2
-      env: TYPO3=^8.7
-    - stage: test
-      php: 7.1
-      env: TYPO3=^8.7
-    - stage: test
-      php: 7.0
-      env: TYPO3=^8.7
     - stage: test
       php: 5.6
-      env: TYPO3=^7.6
+      env: TYPO3=^6.2
     - stage: test
       php: 5.5
-      env: TYPO3=^7.6
-
-    - stage: 🚢 to ter
-      if: tag IS present AND env(TYPO3_ORG_USERNAME) IS present AND env(TYPO3_ORG_PASSWORD) IS present
-      php: 7.0
-      env: TYPO3=^8.7
-      before_install: skip
-      install: skip
-      before_script: skip
-      script:
-        - >
-          echo;
-          echo "Preparing upload of release ${TRAVIS_TAG} to TER";
-          echo;
-          echo;
-          composer global require helhum/ter-client;
-
-        - >
-          TAG_MESSAGE=`git tag -n10 -l $TRAVIS_TAG | sed 's/^[0-9.]*[ ]*//g'`;
-          echo;
-          echo "Uploading release ${TRAVIS_TAG} to TER";
-          echo;
-          echo;
-          $HOME/.composer/vendor/bin/ter-client upload filefill . -u "$TYPO3_ORG_USERNAME" -p "$TYPO3_ORG_PASSWORD" -m "$TAG_MESSAGE";
-
-    - stage: ✔ with sonarqube scanner
-      if: type = push AND branch IN (master, pre-merge) AND env(SONAR_TOKEN) IS present AND fork = false
-      php: 7.2
-      before_install: skip
-      install:
-        - mkdir -p .Log/coverage/ .Log/junit/
-        - export TYPO3_PATH_WEB=$PWD/.Build/public
-        - export typo3DatabaseName=typo3
-        - export typo3DatabaseHost=localhost
-        - export typo3DatabaseUsername=root
-        - export typo3DatabasePassword=
-      before_script:
-      script:
-        - >
-          if [ -d "Tests" ]; then
-            for TYPO3 in "^7.6" "^8.7"; do
-
-              echo;
-              echo "Running TYPO3 version $TYPO3";
-              echo;
-              echo;
-              git clean -Xdf;
-              composer require --dev nimut/typo3-complete:"$TYPO3";
-              git checkout composer.json;
-              VERSION=${TYPO3//[!0-9]/};
-
-              mkdir -p .Build/public/typo3conf/ext/
-              if [ ! -L .Build/public/typo3conf/ext/filefill ]; then ln -snvf ../../../../. .Build/public/typo3conf/ext/filefill; fi
-
-              if [ -d "Tests/Unit" ]; then
-                echo;
-                echo "Running unit tests";
-                echo;
-                echo;
-                .Build/bin/phpunit --bootstrap .Build/vendor/nimut/testing-framework/res/Configuration/UnitTestsBootstrap.php --log-junit .Log/junit/unit_$VERSION.xml --coverage-php .Log/coverage/unit_$VERSION.cov Tests/Unit/;
-              fi
-
-              if [ -d "Tests/Functional" ]; then
-                echo;
-                echo "Running functional tests";
-                echo;
-                echo;
-                .Build/bin/phpunit --bootstrap .Build/vendor/nimut/testing-framework/res/Configuration/FunctionalTestsBootstrap.php --log-junit .Log/junit/functional_$VERSION.xml --coverage-php .Log/coverage/functional_$VERSION.cov Tests/Functional/;
-              fi
-            done
-
-            echo;
-            echo "Merging log and coverage files";
-            echo;
-            echo;
-            composer require --update-with-all-dependencies nimut/phpunit-merger;
-            .Build/bin/phpunit-merger coverage .Log/coverage/ .Log/coverage.xml;
-            .Build/bin/phpunit-merger log .Log/junit/ .Log/junit.xml;
-          fi
-
-        - git fetch --unshallow || true
-
-        - >
-          echo;
-          echo "Running SonarQube Scanner";
-          echo;
-          echo;
-          sonar-scanner;
+      env: TYPO3=^6.2
+    - stage: test
+      php: 5.4
+      env: TYPO3=^6.2
+    - stage: test
+      php: 5.3
+      env: TYPO3=^6.2
+      dist: precise
diff --git a/Classes/Hooks/ResetMissingFiles.php b/Classes/Hooks/ResetMissingFiles.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 namespace IchHabRecht\Filefill\Hooks;
 
 /*
@@ -28,7 +27,8 @@ class ResetMissingFiles
     public function processDatamap_afterDatabaseOperations($status, $table, $id)
     {
         if ($table !== 'sys_file_storage'
-            || empty($_POST['_save_tx_filefill_missing'])
+            || empty($_POST['_savedok_x'])
+            || $_POST['_savedok_x'] !== 'filefill'
             || !MathUtility::canBeInterpretedAsInteger($id)
         ) {
             return;
@@ -37,9 +37,9 @@ public function processDatamap_afterDatabaseOperations($status, $table, $id)
         $databaseConnection->exec_UPDATEquery(
             'sys_file',
             'storage=' . (int)$id . ' AND missing=1',
-            [
+            array(
                 'missing' => 0,
-            ]
+            )
         );
     }
 

diff --git a/Classes/Resource/Domain/DomainResource.php b/Classes/Resource/Domain/DomainResource.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 namespace IchHabRecht\Filefill\Resource\Domain;
 
 /*
@@ -40,10 +39,10 @@ public function __construct($url)
      */
     public function hasFile($fileIdentifier, $filePath)
     {
-        $report = [];
+        $report = array();
         GeneralUtility::getUrl($this->url . ltrim($filePath, '/'), 2, false, $report);
 
-        $isCurlResponse = in_array($report['lib'], ['cURL', 'GuzzleHttp'], true)
+        $isCurlResponse = in_array($report['lib'], array('cURL', 'GuzzleHttp'), true)
             && (
                 (empty($report['http_code']) && (int)$report['error'] === 200)
                 || (int)$report['http_code'] === 200

diff --git a/Classes/Resource/Domain/DomainResourceRepository.php b/Classes/Resource/Domain/DomainResourceRepository.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 namespace IchHabRecht\Filefill\Resource\Domain;
 
 /*
@@ -26,7 +25,7 @@ class DomainResourceRepository
      */
     public function findAll()
     {
-        $domainResources = [];
+        $domainResources = array();
 
         $databaseConnection = $this->getDatabaseConnection();
 
@@ -49,7 +48,7 @@ public function findAll()
 
         while ($row = $result->fetch_assoc()) {
             $url = 'http://' . $row['domainName'];
-            $domainResources[] = GeneralUtility::makeInstance(DomainResource::class, $url);
+            $domainResources[] = GeneralUtility::makeInstance('IchHabRecht\\Filefill\\Resource\\Domain\\DomainResource', $url);
         }
 
         return $domainResources;

diff --git a/Classes/Resource/Driver/FileFillDriver.php b/Classes/Resource/Driver/FileFillDriver.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 namespace IchHabRecht\Filefill\Resource\Driver;
 
 /*

diff --git a/Classes/Resource/Placeholder/PlaceholderResource.php b/Classes/Resource/Placeholder/PlaceholderResource.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 namespace IchHabRecht\Filefill\Resource\Placeholder;
 
 /*
@@ -18,7 +17,6 @@
 use IchHabRecht\Filefill\Resource\RemoteResourceInterface;
 use TYPO3\CMS\Core\Database\DatabaseConnection;
 use TYPO3\CMS\Core\Resource\FileInterface;
-use TYPO3\CMS\Core\Resource\ProcessedFile;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -27,12 +25,12 @@ class PlaceholderResource implements RemoteResourceInterface
     /**
      * @var array
      */
-    protected $allowedFileExtensions = [
+    protected $allowedFileExtensions = array(
         'gif',
         'jpeg',
         'jpg',
         'png',
-    ];
+    );
 
     /**
      * @var string
@@ -42,7 +40,7 @@ class PlaceholderResource implements RemoteResourceInterface
     /**
      * @var FileInterface[]
      */
-    protected static $fileIdentifierCache = [];
+    protected static $fileIdentifierCache = array();
 
     /**
      * @param string $fileIdentifier
@@ -59,7 +57,7 @@ public function hasFile($fileIdentifier, $filePath)
         if (!isset(static::$fileIdentifierCache[$fileIdentifier])) {
             $resourceFactory = ResourceFactory::getInstance();
             $localPath = $filePath;
-            $storage = $resourceFactory->getStorageObject(0, [], $localPath);
+            $storage = $resourceFactory->getStorageObject(0, array(), $localPath);
             if ($storage->getUid() === 0) {
                 static::$fileIdentifierCache[$fileIdentifier] = false;
 
@@ -89,10 +87,10 @@ public function hasFile($fileIdentifier, $filePath)
 
                 $originalFile = $resourceFactory->getFileObject((int)$databaseRow['original']);
                 $taskType = $databaseRow['task_type'];
-                $configuration = unserialize($databaseRow['configuration'], ['allowed_classes' => false]);
+                $configuration = unserialize($databaseRow['configuration']);
 
                 $fileObject = GeneralUtility::makeInstance(
-                    ProcessedFile::class,
+                    'TYPO3\\CMS\\Core\\Resource\\ProcessedFile',
                     $originalFile,
                     $taskType,
                     $configuration,

diff --git a/Classes/Resource/RemoteResourceCollection.php b/Classes/Resource/RemoteResourceCollection.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 namespace IchHabRecht\Filefill\Resource;
 
 /*

diff --git a/Classes/Resource/RemoteResourceCollectionFactory.php b/Classes/Resource/RemoteResourceCollectionFactory.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 namespace IchHabRecht\Filefill\Resource;
 
 /*
@@ -15,9 +14,6 @@
  * LICENSE file that was distributed with this source code.
  */
 
-use IchHabRecht\Filefill\Resource\Domain\DomainResource;
-use IchHabRecht\Filefill\Resource\Domain\DomainResourceRepository;
-use IchHabRecht\Filefill\Resource\Placeholder\PlaceholderResource;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class RemoteResourceCollectionFactory
@@ -29,7 +25,7 @@ class RemoteResourceCollectionFactory
      */
     public static function createRemoteResourceCollectionFromConfiguration(array $configuration)
     {
-        $remoteResources = [];
+        $remoteResources = array();
 
         foreach ($configuration as $key => $resource) {
             if (empty($resource)) {
@@ -39,22 +35,22 @@ public static function createRemoteResourceCollectionFromConfiguration(array $co
             switch ($key) {
                 case 'domain':
                     foreach ($resource as $domain) {
-                        $remoteResources[] = GeneralUtility::makeInstance(DomainResource::class, $domain);
+                        $remoteResources[] = GeneralUtility::makeInstance('IchHabRecht\\Filefill\\Resource\\Domain\\DomainResource', $domain);
                     }
                     break;
                 case 'sys_domain':
-                    $domainResourceRepository = GeneralUtility::makeInstance(DomainResourceRepository::class);
+                    $domainResourceRepository = GeneralUtility::makeInstance('IchHabRecht\\Filefill\\Resource\\Domain\\DomainResourceRepository');
                     $remoteResources = array_merge($remoteResources, $domainResourceRepository->findAll());
                     break;
                 case 'placeholder':
-                    $remoteResources[] = GeneralUtility::makeInstance(PlaceholderResource::class);
+                    $remoteResources[] = GeneralUtility::makeInstance('IchHabRecht\\Filefill\\Resource\\Placeholder\\PlaceholderResource');
                     break;
                 default:
                     throw new \RuntimeException('Unexpected File Fill Resource configuration "' . $key . '"', 1519788775);
             }
         }
 
-        return GeneralUtility::makeInstance(RemoteResourceCollection::class, $remoteResources);
+        return GeneralUtility::makeInstance('IchHabRecht\\Filefill\\Resource\\RemoteResourceCollection', $remoteResources);
     }
 
     /**
@@ -64,7 +60,7 @@ public static function createRemoteResourceCollectionFromConfiguration(array $co
      */
     public static function createRemoteResourceCollectionFromFlexForm($flexForm)
     {
-        $configuration = [];
+        $configuration = array();
 
         $resourcesConfiguration = GeneralUtility::xml2array($flexForm);
 
@@ -78,11 +74,11 @@ public static function createRemoteResourceCollectionFromFlexForm($flexForm)
             switch ($key) {
                 case 'domain':
                     if (empty($configuration[$key])) {
-                        $configuration[$key] = [];
+                        $configuration[$key] = array();
                     }
                     $configuration[$key] = array_merge(
                         $configuration[$key],
-                        [$resource['domain']['el']['domain']['vDEF']]
+                        array($resource['domain']['el']['domain']['vDEF'])
                     );
                     break;
                 case 'sys_domain':

diff --git a/Classes/Resource/RemoteResourceInterface.php b/Classes/Resource/RemoteResourceInterface.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 namespace IchHabRecht\Filefill\Resource;
 
 /*

diff --git a/Classes/Slot/FileProcessingServiceSlot.php b/Classes/Slot/FileProcessingServiceSlot.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 namespace IchHabRecht\Filefill\Slot;
 
 /*