Merge pull request #23 from rengaw83/feature/compatibility-php8

[TASK] Make compatible to PHP 8 and TYPO3 11

Classes/Domain/Model/Dto/Table.php

@@ -50,12 +50,12 @@ public function __construct(string $tableName)
  $this->title = $tcaCtrl['title'];
  $this->titleField = $tcaCtrl['label'];
  $this->deletedField = isset($tcaCtrl['delete']) ? $tcaCtrl['delete'] : '';
- $this->titleLabel = $GLOBALS['TCA'][$tableName]['columns'][$this->titleField]['label'];
- $this->gdprRestrictionField = $tcaCtrl['gdpr']['restriction_field'] ?: '';
- $this->gdprRandomizedField = $tcaCtrl['gdpr']['randomized_field'] ?: '';
- $this->gdprRandomizeMapping = $tcaCtrl['gdpr']['randomize_mapping'] ?: [];
- $this->gdprRandomizedDateField = $tcaCtrl['gdpr']['randomize_datefield'] ?: '';
- $this->gdprExpirePeriod = $tcaCtrl['gdpr']['randomize_expirePeriod'] ?: 365;
+ $this->titleLabel = $GLOBALS['TCA'][$tableName]['columns'][$this->titleField]['label'] ?? '';
+ $this->gdprRestrictionField = $tcaCtrl['gdpr']['restriction_field'] ?? '';
+ $this->gdprRandomizedField = $tcaCtrl['gdpr']['randomized_field'] ?? '';
+ $this->gdprRandomizeMapping = $tcaCtrl['gdpr']['randomize_mapping'] ?? [];
+ $this->gdprRandomizedDateField = $tcaCtrl['gdpr']['randomize_datefield'] ?? '';
+ $this->gdprExpirePeriod = $tcaCtrl['gdpr']['randomize_expirePeriod'] ?? 365;
  }
 
  /**

Classes/Domain/Repository/RecordRepository.php

@@ -60,8 +60,8 @@ public function getStatisticOfTable(string $table): array
  ->fetchAll();
 
  return [
- 'restricted' => (int)$rows[1]['count'],
- 'public' => (int)$rows[0]['count']
+ 'restricted' => (int) ($rows[1]['count'] ?? 0),
+ 'public' => (int) ($rows[0]['count'] ?? 0)
  ];
  }
 

Classes/Hooks/IconFactoryHook.php

@@ -14,7 +14,7 @@ public function postOverlayPriorityLookup($table, array $row, array $status, $ic
  {
  if (TableInformation::isTableEnabled($table)) {
  $table = Table::getInstance($table);
- if ($table->randomizationEnabled() && $row[$table->getGdprRandomizedField()]) {
+ if ($table->randomizationEnabled() && ($row[$table->getGdprRandomizedField()] ?? false)) {
  $iconName = 'overlay-locked';
  }
  }

Classes/Service/TableInformation.php

@@ -9,6 +9,7 @@ class TableInformation
  public static function isTableEnabled(string $table): bool
  {
  if (isset($GLOBALS['TCA'][$table])
+ && !empty($GLOBALS['TCA'][$table]['ctrl']['gdpr'])
  && is_array($GLOBALS['TCA'][$table]['ctrl']['gdpr'])
  && $GLOBALS['TCA'][$table]['ctrl']['gdpr']['enabled']) {
  return true;

Configuration/Services.yaml

@@ -0,0 +1,31 @@
+services:
+ _defaults:
+ autowire: true
+ autoconfigure: true
+ public: false
+
+ GeorgRinger\Gdpr\:
+ resource: '../Classes/*'
+ exclude: '../Classes/Domain/Model/*'
+
+ #
+ # Commands to be executed by typo3, where the key of the array
+ # is the name of the command (to be called as the first argument after typo3).
+ # Required parameter is the "class" of the command which needs to be a subclass
+ # of Symfony/Console/Command.
+ #
+ # example: bin/typo3 gdpr:randomize
+
+ GeorgRinger\Gdpr\Command\RandomizeCommand:
+ tags:
+ -
+ name: 'console.command'
+ command: 'gdpr:randomize'
+ description: 'Randomize data'
+
+ GeorgRinger\Gdpr\Command\AnonymizeIpCommand:
+ tags:
+ -
+ name: 'console.command'
+ command: 'gdpr:anonymizeIp'
+ description: 'Anonymize IP address of given rows'

composer.json

@@ -20,7 +20,7 @@
  ],
  "require": {
  "typo3/cms-core": "^10 || ^11",
- "fzaninotto/faker": "^1.7"
+ "fakerphp/faker": "^1.10"
  },
  "autoload": {
  "psr-4": {