Merge branch 'release/0.5.7'

CPS-IT · Oct 24, 2023 · a72d62b · a72d62b
2 parents 8cb6031 + 76fadb8
commit a72d62b
Show file tree

Hide file tree

Showing 10 changed files with 394 additions and 444 deletions.
diff --git a/.github/workflows/cgl.yaml b/.github/workflows/cgl.yaml
@@ -31,7 +31,7 @@ jobs:
       # Install dependencies
       - name: Install Composer dependencies
         run: |
-          composer require --no-progress --no-plugins brotkrueml/schema:"^2.7"
+          composer require --no-progress --no-plugins brotkrueml/schema:"^2.7 || ^3.0"
 
       # Check Composer dependencies
       - name: Check dependencies

diff --git a/Classes/Command/ImportCommand.php b/Classes/Command/ImportCommand.php
@@ -154,10 +154,10 @@ private function printResult(ImportResult $result): void
             }
 
             // Sort jobs by personio id
-            usort($jobs, static fn (Job $a, Job $b) => $a->getPersonioId() <=> $b->getPersonioId());
+            usort($jobs, static fn(Job $a, Job $b) => $a->getPersonioId() <=> $b->getPersonioId());
 
             // Add job to table
-            $table->addRows(array_map(static fn (Job $job) => self::decorateTableRow($job, $importOperation), $jobs));
+            $table->addRows(array_map(static fn(Job $job) => self::decorateTableRow($job, $importOperation), $jobs));
 
             $rowsAdded = true;
         }

diff --git a/Classes/Domain/Factory/SchemaFactory.php b/Classes/Domain/Factory/SchemaFactory.php
@@ -39,6 +39,7 @@
 use Psr\EventDispatcher\EventDispatcherInterface;
 use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 
 /**
@@ -69,8 +70,18 @@ public function createJobPosting(Job $job): JobPosting
         $organizationType = $this->createOrganization($job);
         $placeType = $this->createPlace($job);
 
-        /** @var JobPosting $jobPosting */
-        $jobPosting = TypeFactory::createType('JobPosting')
+        // Create job posting
+        if (method_exists(TypeFactory::class, 'create')) {
+            // @todo Use DI once support for EXT:schema v2 is dropped
+            $jobPosting = GeneralUtility::makeInstance(TypeFactory::class)->create('JobPosting');
+        } else {
+            // @todo Remove once support for EXT:schema v2 is dropped
+            $jobPosting = TypeFactory::createType('JobPosting');
+        }
+
+        \assert($jobPosting instanceof JobPosting);
+
+        $jobPosting
             ->setProperty('datePosted', ($job->getCreateDate() ?? new DateTime())->format('Y-m-d'))
             ->setProperty('employmentType', $this->decorateEmploymentType($job))
             ->setProperty('hiringOrganization', $organizationType)

diff --git a/Classes/Domain/Repository/JobRepository.php b/Classes/Domain/Repository/JobRepository.php
@@ -89,7 +89,7 @@ public function findOrphans(array $existingJobs, int $storagePid = null): QueryR
                 $query->logicalNot(
                     $query->in(
                         'personioId',
-                        array_map(static fn (Job $job) => $job->getPersonioId(), $existingJobs),
+                        array_map(static fn(Job $job) => $job->getPersonioId(), $existingJobs),
                     ),
                 ),
             );

diff --git a/Classes/Mapper/Source/XmlSource.php b/Classes/Mapper/Source/XmlSource.php
@@ -53,7 +53,7 @@ public function __construct(array $source)
      */
     public static function fromXml(string $xml): self
     {
-        set_error_handler(static fn (int $code, string $message) => self::handleParseError($xml, $message));
+        set_error_handler(static fn(int $code, string $message) => self::handleParseError($xml, $message));
 
         try {
             $source = XmlToArray::convert($xml);

diff --git a/Resources/Private/Libs/Build/composer.lock b/Resources/Private/Libs/Build/composer.lock
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
 	},
 	"require-dev": {
 		"armin/editorconfig-cli": "^1.5",
-		"brotkrueml/schema": "^2.7",
+		"brotkrueml/schema": "^2.7 || ^3.0",
 		"ergebnis/composer-normalize": "^2.29",
 		"helmich/typo3-typoscript-lint": "^3.0",
 		"phpstan/extension-installer": "^1.2",
@@ -58,9 +58,9 @@
 	"config": {
 		"allow-plugins": {
 			"ergebnis/composer-normalize": true,
-			"typo3/cms-composer-installers": true,
+			"phpstan/extension-installer": true,
 			"typo3/class-alias-loader": true,
-			"phpstan/extension-installer": true
+			"typo3/cms-composer-installers": true
 		},
 		"bin-dir": ".Build/bin",
 		"sort-packages": true,