From 8e25065b5e5aaac9e2119780d839989befad9fc9 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 15:51:37 +0100 Subject: [PATCH 01/20] Remove MD5-handling for Flow 7.x compatibility See https://github.com/neos/flow-development-collection/pull/2113 --- Classes/GcsStorage.php | 15 ++++----------- Classes/GcsTarget.php | 17 ++++++++--------- README.md | 1 - composer.json | 3 +-- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/Classes/GcsStorage.php b/Classes/GcsStorage.php index 56598b3..749f8c6 100644 --- a/Classes/GcsStorage.php +++ b/Classes/GcsStorage.php @@ -26,7 +26,6 @@ use Neos\Flow\ResourceManagement\Storage\StorageObject; use Neos\Flow\ResourceManagement\Storage\WritableStorageInterface; use Neos\Flow\Utility\Environment; -use Neos\Utility\Exception\FilesException; use Psr\Log\LoggerInterface; /** @@ -227,7 +226,6 @@ public function importResource($source, $collectionName): PersistentResource public function importResourceFromContent($content, $collectionName): PersistentResource { $sha1Hash = sha1($content); - $md5Hash = md5($content); $filename = $sha1Hash; $resource = new PersistentResource(); @@ -235,7 +233,6 @@ public function importResourceFromContent($content, $collectionName): Persistent $resource->setFileSize(strlen($content)); $resource->setCollectionName($collectionName); $resource->setSha1($sha1Hash); - $resource->setMd5($md5Hash); $this->getCurrentBucket()->upload($content, [ 'name' => $this->keyPrefix . $sha1Hash, @@ -276,14 +273,12 @@ public function importUploadedResource(array $uploadInfo, string $collectionName } $sha1Hash = sha1_file($newSourcePathAndFilename); - $md5Hash = md5_file($newSourcePathAndFilename); $resource = new PersistentResource(); $resource->setFilename($originalFilename); $resource->setCollectionName($collectionName); $resource->setFileSize(filesize($newSourcePathAndFilename)); $resource->setSha1($sha1Hash); - $resource->setMd5($md5Hash); try { $this->getCurrentBucket()->upload(fopen($newSourcePathAndFilename, 'rb'), [ @@ -369,16 +364,16 @@ public function getStreamByResourcePath($relativePath) /** * Retrieve all Objects stored in this storage. * - * @return array<\Neos\Flow\ResourceManagement\Storage\StorageObject> + * @return StorageObject[] * @api */ public function getObjects() { $objects = []; foreach ($this->resourceManager->getCollectionsByStorage($this) as $collection) { + /** @noinspection SlowArrayOperationsInLoopInspection */ $objects = array_merge($objects, $this->getObjectsByCollection($collection)); } - return $objects; } @@ -386,7 +381,7 @@ public function getObjects() * Retrieve all Objects stored in this storage, filtered by the given collection name * * @param CollectionInterface $collection - * @return array<\Neos\Flow\ResourceManagement\Storage\StorageObject> + * @return StorageObject[] * @api */ public function getObjectsByCollection(CollectionInterface $collection): array @@ -421,13 +416,11 @@ public function getObjectsByCollection(CollectionInterface $collection): array protected function importTemporaryFile(string $temporaryPathAndFilename, string $collectionName): PersistentResource { $sha1Hash = sha1_file($temporaryPathAndFilename); - $md5Hash = md5_file($temporaryPathAndFilename); $resource = new PersistentResource(); $resource->setFileSize(filesize($temporaryPathAndFilename)); $resource->setCollectionName($collectionName); $resource->setSha1($sha1Hash); - $resource->setMd5($md5Hash); $bucket = $this->getCurrentBucket(); if (!$bucket->object($this->keyPrefix . $sha1Hash)->exists()) { @@ -449,7 +442,7 @@ protected function importTemporaryFile(string $temporaryPathAndFilename, string throw $exception; } - $this->logger->info(sprintf('Google Cloud Storage: Successfully imported resource as object "%s" into bucket "%s" with MD5 hash "%s"', $sha1Hash, $this->bucketName, $resource->getMd5() ?: 'unknown'), LogEnvironment::fromMethodName(__METHOD__)); + $this->logger->info(sprintf('Google Cloud Storage: Successfully imported resource as object "%s" into bucket "%s" with SHA1 hash "%s"', $sha1Hash, $this->bucketName, $resource->getSha1() ?: 'unknown'), LogEnvironment::fromMethodName(__METHOD__)); } else { $this->logger->info(sprintf('Google Cloud Storage: Did not import resource as object "%s" into bucket "%s" because that object already existed.', $sha1Hash, $this->bucketName), LogEnvironment::fromMethodName(__METHOD__)); } diff --git a/Classes/GcsTarget.php b/Classes/GcsTarget.php index 84ca8b5..040dc39 100644 --- a/Classes/GcsTarget.php +++ b/Classes/GcsTarget.php @@ -393,7 +393,7 @@ private function publishCollectionFromDifferentGoogleCloudStorage(CollectionInte } catch (\Exception $e) { $this->messageCollector->append(sprintf('Could not publish resource with SHA1 hash %s of collection %s from bucket %s to %s: %s', $object->getSha1(), $collection->getName(), $storageBucketName, $this->bucketName, $e->getMessage())); } - $this->logger->debug(sprintf('Successfully copied resource as object "%s" (MD5: %s) from bucket "%s" to bucket "%s" (with GZIP compression)', $targetObjectName, $object->getMd5() ?: 'unknown', $storageBucketName, $this->bucketName), LogEnvironment::fromMethodName(__METHOD__)); + $this->logger->debug(sprintf('Successfully copied resource as object "%s" (SHA1: %s) from bucket "%s" to bucket "%s" (with GZIP compression)', $targetObjectName, $object->getSha1() ?: 'unknown', $storageBucketName, $this->bucketName), LogEnvironment::fromMethodName(__METHOD__)); } else { try { $this->logger->debug(sprintf('Copy object "%s" to bucket "%s"', $targetObjectName, $this->bucketName), LogEnvironment::fromMethodName(__METHOD__)); @@ -414,7 +414,7 @@ private function publishCollectionFromDifferentGoogleCloudStorage(CollectionInte } continue; } - $this->logger->debug(sprintf('Successfully copied resource as object "%s" (MD5: %s) from bucket "%s" to bucket "%s"', $targetObjectName, $object->getMd5() ?: 'unknown', $storageBucketName, $this->bucketName), LogEnvironment::fromMethodName(__METHOD__)); + $this->logger->debug(sprintf('Successfully copied resource as object "%s" (SHA1: %s) from bucket "%s" to bucket "%s"', $targetObjectName, $object->getSha1() ?: 'unknown', $storageBucketName, $this->bucketName), LogEnvironment::fromMethodName(__METHOD__)); } unset($targetObjectName); $iteration++; @@ -495,7 +495,7 @@ public function publishResource(PersistentResource $resource, CollectionInterfac return; } - $this->logger->debug(sprintf('Successfully published resource as object "%s" (MD5: %s) by copying from bucket "%s" to bucket "%s"', $targetObjectName, $resource->getMd5() ?: 'unknown', $storage->getBucketName(), $this->bucketName), LogEnvironment::fromMethodName(__METHOD__)); + $this->logger->debug(sprintf('Successfully published resource as object "%s" (SHA1: %s) by copying from bucket "%s" to bucket "%s"', $targetObjectName, $resource->getSha1() ?: 'unknown', $storage->getBucketName(), $this->bucketName), LogEnvironment::fromMethodName(__METHOD__)); } else { $sourceStream = $resource->getStream(); if ($sourceStream === false) { @@ -523,7 +523,7 @@ public function unpublishResource(PersistentResource $resource): void try { $objectName = $this->keyPrefix . $this->getRelativePublicationPathAndFilename($resource); $this->getCurrentBucket()->object($objectName)->delete(); - $this->logger->debug(sprintf('Successfully unpublished resource as object "%s" (MD5: %s) from bucket "%s"', $objectName, $resource->getMd5() ?: 'unknown', $this->bucketName), LogEnvironment::fromMethodName(__METHOD__)); + $this->logger->debug(sprintf('Successfully unpublished resource as object "%s" (SHA1: %s) from bucket "%s"', $objectName, $resource->getSha1() ?: 'unknown', $this->bucketName), LogEnvironment::fromMethodName(__METHOD__)); } catch (NotFoundException $e) { } } @@ -552,7 +552,6 @@ public function getPublicPersistentResourceUri(PersistentResource $resource): st '{bucketName}' => $this->bucketName, '{keyPrefix}' => $this->keyPrefix, '{sha1}' => $resource->getSha1(), - '{md5}' => $resource->getMd5(), '{filename}' => $resource->getFilename(), '{fileExtension}' => $resource->getFileExtension() ]; @@ -603,16 +602,16 @@ protected function publishFile($sourceStream, string $relativeTargetPathAndFilen $sourceStream = fopen($temporaryTargetPathAndFilename, 'rb'); $uploadParameters['metadata']['contentEncoding'] = 'gzip'; - $this->logger->debug(sprintf('Converted resource data of object "%s" in bucket "%s" with MD5 hash "%s" to GZIP with level %s.', $objectName, $this->bucketName, $metaData->getMd5() ?: 'unknown', $this->gzipCompressionLevel), LogEnvironment::fromMethodName(__METHOD__)); + $this->logger->debug(sprintf('Converted resource data of object "%s" in bucket "%s" with SHA1 hash "%s" to GZIP with level %s.', $objectName, $this->bucketName, $metaData->getSha1() ?: 'unknown', $this->gzipCompressionLevel), LogEnvironment::fromMethodName(__METHOD__)); } catch (\Exception $e) { - $this->messageCollector->append(sprintf('Failed publishing resource as object "%s" in bucket "%s" with MD5 hash "%s": %s', $objectName, $this->bucketName, $metaData->getMd5() ?: 'unknown', $e->getMessage()), LOG_WARNING, 1520257344878); + $this->messageCollector->append(sprintf('Failed publishing resource as object "%s" in bucket "%s" with SHA1 hash "%s": %s', $objectName, $this->bucketName, $metaData->getSha1() ?: 'unknown', $e->getMessage()), LOG_WARNING, 1520257344878); } } try { $this->getCurrentBucket()->upload($sourceStream, $uploadParameters); - $this->logger->debug(sprintf('Successfully published resource as object "%s" in bucket "%s" with MD5 hash "%s"', $objectName, $this->bucketName, $metaData->getMd5() ?: 'unknown'), LogEnvironment::fromMethodName(__METHOD__)); + $this->logger->debug(sprintf('Successfully published resource as object "%s" in bucket "%s" with SHA1 hash "%s"', $objectName, $this->bucketName, $metaData->getSha1() ?: 'unknown'), LogEnvironment::fromMethodName(__METHOD__)); } catch (\Exception $e) { - $this->messageCollector->append(sprintf('Failed publishing resource as object "%s" in bucket "%s" with MD5 hash "%s": %s', $objectName, $this->bucketName, $metaData->getMd5() ?: 'unknown', $e->getMessage()), LOG_WARNING, 1506847965352); + $this->messageCollector->append(sprintf('Failed publishing resource as object "%s" in bucket "%s" with SHA1 hash "%s": %s', $objectName, $this->bucketName, $metaData->getSha1() ?: 'unknown', $e->getMessage()), LOG_WARNING, 1506847965352); } finally { if (is_resource($sourceStream)) { fclose($sourceStream); diff --git a/README.md b/README.md index 0d90952..75a7a32 100644 --- a/README.md +++ b/README.md @@ -233,7 +233,6 @@ The possible placeholders are: - `{bucketName}` The target's bucket name - `{keyPrefix}` The target's configured key prefix - `{sha1}` The resource's SHA1 -- `{md5}` The resource's MD5 🙄 - `{filename}` The resource's full filename, for example "logo.svg" - `{fileExtension}` The resource's file extension, for example "svg" diff --git a/composer.json b/composer.json index 59df614..42f1c7d 100644 --- a/composer.json +++ b/composer.json @@ -14,9 +14,8 @@ "MIT" ], "require": { - "neos/flow": "^5.2 || ^6.0 || @dev", + "neos/flow": "^5.2 || ^6.0 || ^7.0", "google/cloud-storage": "1.1.*", - "guzzlehttp/psr7": "1.*", "ext-json": "*", "ext-pdo": "*", "ext-zlib": "*" From e0b6e2236332abf2d790a53315aa5e5cf84c798e Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:00:38 +0100 Subject: [PATCH 02/20] Adjust severity constants to Neos.Error.Messages --- Classes/GcsTarget.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Classes/GcsTarget.php b/Classes/GcsTarget.php index 040dc39..47f83bb 100644 --- a/Classes/GcsTarget.php +++ b/Classes/GcsTarget.php @@ -20,6 +20,7 @@ use Google\Cloud\Storage\StorageClient; use Google\Cloud\Storage\StorageObject; use GuzzleHttp\Psr7\Uri; +use Neos\Error\Messages\Error; use Neos\Flow\Annotations as Flow; use Neos\Flow\Log\Utility\LogEnvironment; use Neos\Flow\ObjectManagement\ObjectManagerInterface; @@ -488,9 +489,9 @@ public function publishResource(PersistentResource $resource, CollectionInterfac } catch (GoogleException $e) { $googleError = json_decode($e->getMessage()); if ($googleError instanceof \stdClass && isset($googleError->error->message)) { - $this->messageCollector->append(sprintf('Could not copy resource with SHA1 hash %s of collection %s from bucket %s to %s: %s', $resource->getSha1(), $collection->getName(), $storage->getBucketName(), $this->bucketName, $googleError->error->message), LOG_ERR, 1446721791); + $this->messageCollector->append(sprintf('Could not copy resource with SHA1 hash %s of collection %s from bucket %s to %s: %s', $resource->getSha1(), $collection->getName(), $storage->getBucketName(), $this->bucketName, $googleError->error->message), Error::SEVERITY_ERROR, 1446721791); } else { - $this->messageCollector->append(sprintf('Could not copy resource with SHA1 hash %s of collection %s from bucket %s to %s: %s', $resource->getSha1(), $collection->getName(), $storage->getBucketName(), $this->bucketName, $e->getMessage()), LOG_ERR, 1446721791); + $this->messageCollector->append(sprintf('Could not copy resource with SHA1 hash %s of collection %s from bucket %s to %s: %s', $resource->getSha1(), $collection->getName(), $storage->getBucketName(), $this->bucketName, $e->getMessage()), Error::SEVERITY_ERROR, 1446721791); } return; } @@ -499,7 +500,7 @@ public function publishResource(PersistentResource $resource, CollectionInterfac } else { $sourceStream = $resource->getStream(); if ($sourceStream === false) { - $this->messageCollector->append(sprintf('Could not publish resource with SHA1 hash %s of collection %s because there seems to be no corresponding data in the storage.', $resource->getSha1(), $collection->getName()), LOG_ERR, 1446721810); + $this->messageCollector->append(sprintf('Could not publish resource with SHA1 hash %s of collection %s because there seems to be no corresponding data in the storage.', $resource->getSha1(), $collection->getName()), Error::SEVERITY_ERROR, 1446721810); return; } $this->publishFile($sourceStream, $this->getRelativePublicationPathAndFilename($resource), $resource); @@ -604,14 +605,14 @@ protected function publishFile($sourceStream, string $relativeTargetPathAndFilen $this->logger->debug(sprintf('Converted resource data of object "%s" in bucket "%s" with SHA1 hash "%s" to GZIP with level %s.', $objectName, $this->bucketName, $metaData->getSha1() ?: 'unknown', $this->gzipCompressionLevel), LogEnvironment::fromMethodName(__METHOD__)); } catch (\Exception $e) { - $this->messageCollector->append(sprintf('Failed publishing resource as object "%s" in bucket "%s" with SHA1 hash "%s": %s', $objectName, $this->bucketName, $metaData->getSha1() ?: 'unknown', $e->getMessage()), LOG_WARNING, 1520257344878); + $this->messageCollector->append(sprintf('Failed publishing resource as object "%s" in bucket "%s" with SHA1 hash "%s": %s', $objectName, $this->bucketName, $metaData->getSha1() ?: 'unknown', $e->getMessage()), Error::SEVERITY_WARNING, 1520257344878); } } try { $this->getCurrentBucket()->upload($sourceStream, $uploadParameters); $this->logger->debug(sprintf('Successfully published resource as object "%s" in bucket "%s" with SHA1 hash "%s"', $objectName, $this->bucketName, $metaData->getSha1() ?: 'unknown'), LogEnvironment::fromMethodName(__METHOD__)); } catch (\Exception $e) { - $this->messageCollector->append(sprintf('Failed publishing resource as object "%s" in bucket "%s" with SHA1 hash "%s": %s', $objectName, $this->bucketName, $metaData->getSha1() ?: 'unknown', $e->getMessage()), LOG_WARNING, 1506847965352); + $this->messageCollector->append(sprintf('Failed publishing resource as object "%s" in bucket "%s" with SHA1 hash "%s": %s', $objectName, $this->bucketName, $metaData->getSha1() ?: 'unknown', $e->getMessage()), Error::SEVERITY_WARNING, 1506847965352); } finally { if (is_resource($sourceStream)) { fclose($sourceStream); From 2bd903e649d1d66a96c0790a94d4fc242f310312 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:13 +0100 Subject: [PATCH 03/20] TASK: Apply migration TYPO3.Form-20160601101500 Adjust "Settings.yaml" to use validationErrorTranslationPackage instead of translationPackage Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 42f1c7d..1874d7f 100644 --- a/composer.json +++ b/composer.json @@ -64,7 +64,8 @@ "Neos.Kickstart-20161124230102", "Neos.Imagine-20161124231742", "Neos.Media-20161124233100", - "Neos.Kickstarter-20161125110814" + "Neos.Kickstarter-20161125110814", + "TYPO3.Form-20160601101500" ] } -} +} \ No newline at end of file From 0c6ae9753067585b7bb8f8be1c2ae097230c4f70 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:14 +0100 Subject: [PATCH 04/20] TASK: Apply migration Neos.Twitter.Bootstrap-20161124204912 Adjusts code to package renaming from "TYPO3.Twitter.Bootstrap" to "Neos.Twitter.Bootstrap" Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1874d7f..cab82eb 100644 --- a/composer.json +++ b/composer.json @@ -65,7 +65,8 @@ "Neos.Imagine-20161124231742", "Neos.Media-20161124233100", "Neos.Kickstarter-20161125110814", - "TYPO3.Form-20160601101500" + "TYPO3.Form-20160601101500", + "Neos.Twitter.Bootstrap-20161124204912" ] } } \ No newline at end of file From 8e837fce5ac2c3f2f35be4cbc2812a71205107ed Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:15 +0100 Subject: [PATCH 05/20] TASK: Apply migration Neos.Form-20161124205254 Adjusts code to package renaming from "TYPO3.Form" to "Neos.Form" Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cab82eb..f5ba674 100644 --- a/composer.json +++ b/composer.json @@ -66,7 +66,8 @@ "Neos.Media-20161124233100", "Neos.Kickstarter-20161125110814", "TYPO3.Form-20160601101500", - "Neos.Twitter.Bootstrap-20161124204912" + "Neos.Twitter.Bootstrap-20161124204912", + "Neos.Form-20161124205254" ] } } \ No newline at end of file From c0f766148e3f4afdf6eddc6538e3822cc09616ce Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:16 +0100 Subject: [PATCH 06/20] TASK: Apply migration Neos.Party-20161124225257 Adjusts code to package renaming from "TYPO3.Party" to "Neos.Party" Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f5ba674..5c1c7d7 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,8 @@ "Neos.Kickstarter-20161125110814", "TYPO3.Form-20160601101500", "Neos.Twitter.Bootstrap-20161124204912", - "Neos.Form-20161124205254" + "Neos.Form-20161124205254", + "Neos.Party-20161124225257" ] } } \ No newline at end of file From fa6795931d2389cb269c6208a8d67debf5ac5c85 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:17 +0100 Subject: [PATCH 07/20] TASK: Apply migration Neos.SwiftMailer-20161130105617 Adjusts code to package renaming from "TYPO3.SwiftMailer" to "Neos.SwiftMailer". Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5c1c7d7..59360eb 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,8 @@ "TYPO3.Form-20160601101500", "Neos.Twitter.Bootstrap-20161124204912", "Neos.Form-20161124205254", - "Neos.Party-20161124225257" + "Neos.Party-20161124225257", + "Neos.SwiftMailer-20161130105617" ] } } \ No newline at end of file From 69f90a8b5667a2083ec021365199d80a268e4003 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:18 +0100 Subject: [PATCH 08/20] TASK: Apply migration Neos.Seo-20170127154600 Migrate to new namespace Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 59360eb..f864c4c 100644 --- a/composer.json +++ b/composer.json @@ -69,7 +69,8 @@ "Neos.Twitter.Bootstrap-20161124204912", "Neos.Form-20161124205254", "Neos.Party-20161124225257", - "Neos.SwiftMailer-20161130105617" + "Neos.SwiftMailer-20161130105617", + "Neos.Seo-20170127154600" ] } } \ No newline at end of file From c03475dff4120827e79176615943d2ea8f39f270 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:19 +0100 Subject: [PATCH 09/20] TASK: Apply migration Neos.Flow-20180415105700 Add scalar type hint to CacheAwareInterface implementations. Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f864c4c..d0a75d8 100644 --- a/composer.json +++ b/composer.json @@ -70,7 +70,8 @@ "Neos.Form-20161124205254", "Neos.Party-20161124225257", "Neos.SwiftMailer-20161130105617", - "Neos.Seo-20170127154600" + "Neos.Seo-20170127154600", + "Neos.Flow-20180415105700" ] } } \ No newline at end of file From 91c5993f95c50b11c05757e16621d730ece3cb1b Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:20 +0100 Subject: [PATCH 10/20] TASK: Apply migration Neos.Neos-20180907103800 Migrate RTE formatting configuration to new format Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d0a75d8..782b75b 100644 --- a/composer.json +++ b/composer.json @@ -71,7 +71,8 @@ "Neos.Party-20161124225257", "Neos.SwiftMailer-20161130105617", "Neos.Seo-20170127154600", - "Neos.Flow-20180415105700" + "Neos.Flow-20180415105700", + "Neos.Neos-20180907103800" ] } } \ No newline at end of file From 002687aed9deba170cb348182407787535242c49 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:21 +0100 Subject: [PATCH 11/20] TASK: Apply migration Neos.Neos.Ui-20190319094900 Migrate additional RTE formatting configuration to new format Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 782b75b..8804643 100644 --- a/composer.json +++ b/composer.json @@ -72,7 +72,8 @@ "Neos.SwiftMailer-20161130105617", "Neos.Seo-20170127154600", "Neos.Flow-20180415105700", - "Neos.Neos-20180907103800" + "Neos.Neos-20180907103800", + "Neos.Neos.Ui-20190319094900" ] } } \ No newline at end of file From 32da7f2022994a22dcce09188a5b3ae4e444d122 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:22 +0100 Subject: [PATCH 12/20] TASK: Apply migration Neos.Flow-20190425144900 Adjusts code to FlashMessageContainer renaming from "\Neos\Flow\Mvc" to "\Neos\Flow\Mvc\FlashMessage". Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8804643..5a2aed8 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,8 @@ "Neos.Seo-20170127154600", "Neos.Flow-20180415105700", "Neos.Neos-20180907103800", - "Neos.Neos.Ui-20190319094900" + "Neos.Neos.Ui-20190319094900", + "Neos.Flow-20190425144900" ] } } \ No newline at end of file From ea77f5d0c49db7934b5bb565733c4168e624af5b Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:23 +0100 Subject: [PATCH 13/20] TASK: Apply migration Neos.Flow-20190515215000 Adjust "Settings.yaml" to new PSR-3 logging settings (see https://github.com/neos/flow-development-collection/pull/1574) Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5a2aed8..3bd0811 100644 --- a/composer.json +++ b/composer.json @@ -74,7 +74,8 @@ "Neos.Flow-20180415105700", "Neos.Neos-20180907103800", "Neos.Neos.Ui-20190319094900", - "Neos.Flow-20190425144900" + "Neos.Flow-20190425144900", + "Neos.Flow-20190515215000" ] } } \ No newline at end of file From 83f80683c0928312f6359497cb1630bad210a174 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:25 +0100 Subject: [PATCH 14/20] TASK: Apply migration Neos.NodeTypes-20190917101945 Adjusts code to rename nodetypes that were extracted to subpackages in fusion and nodetype definitions Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3bd0811..bf52c6f 100644 --- a/composer.json +++ b/composer.json @@ -75,7 +75,8 @@ "Neos.Neos-20180907103800", "Neos.Neos.Ui-20190319094900", "Neos.Flow-20190425144900", - "Neos.Flow-20190515215000" + "Neos.Flow-20190515215000", + "Neos.NodeTypes-20190917101945" ] } } \ No newline at end of file From b8432e65bfc16b70dc0ae49d27b47a28aad90cd7 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:26 +0100 Subject: [PATCH 15/20] TASK: Apply migration Neos.NodeTypes-20200120114136 Adjusts code to rename nodetypes that were extracted to subpackages in fusion and nodetype definitions Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bf52c6f..6e3692f 100644 --- a/composer.json +++ b/composer.json @@ -76,7 +76,8 @@ "Neos.Neos.Ui-20190319094900", "Neos.Flow-20190425144900", "Neos.Flow-20190515215000", - "Neos.NodeTypes-20190917101945" + "Neos.NodeTypes-20190917101945", + "Neos.NodeTypes-20200120114136" ] } } \ No newline at end of file From c462b13e0c1fe5daa0a3890cbc6e777ae3e477a3 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:27 +0100 Subject: [PATCH 16/20] TASK: Apply migration Neos.Flow-20200813181400 Adjust "Settings.yaml" to new naming of settings (see https://github.com/neos/flow-development-collection/pull/2051) Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6e3692f..3413865 100644 --- a/composer.json +++ b/composer.json @@ -77,7 +77,8 @@ "Neos.Flow-20190425144900", "Neos.Flow-20190515215000", "Neos.NodeTypes-20190917101945", - "Neos.NodeTypes-20200120114136" + "Neos.NodeTypes-20200120114136", + "Neos.Flow-20200813181400" ] } } \ No newline at end of file From d9ea39287a30d9cc7bc410f15a7bbbe2825b1082 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:28 +0100 Subject: [PATCH 17/20] TASK: Apply migration Neos.Flow-20201003165200 Make default ValueObjects embedded=false Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3413865..129252e 100644 --- a/composer.json +++ b/composer.json @@ -78,7 +78,8 @@ "Neos.Flow-20190515215000", "Neos.NodeTypes-20190917101945", "Neos.NodeTypes-20200120114136", - "Neos.Flow-20200813181400" + "Neos.Flow-20200813181400", + "Neos.Flow-20201003165200" ] } } \ No newline at end of file From 998c761e6c792ffa056b30c736781707b27d4e65 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:29 +0100 Subject: [PATCH 18/20] TASK: Apply migration Neos.Flow-20201109224100 Adjust DB migrations to Doctrine Migrations 3.0 Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 129252e..308d2ec 100644 --- a/composer.json +++ b/composer.json @@ -79,7 +79,8 @@ "Neos.NodeTypes-20190917101945", "Neos.NodeTypes-20200120114136", "Neos.Flow-20200813181400", - "Neos.Flow-20201003165200" + "Neos.Flow-20201003165200", + "Neos.Flow-20201109224100" ] } } \ No newline at end of file From 25283a9e5769be6b70ccb04c1639eb180a62fd82 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:30 +0100 Subject: [PATCH 19/20] TASK: Apply migration Neos.Flow-20201205172733 This migration does not actually change any code. It just displays a warning if a PHP file still refers Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 308d2ec..a20e840 100644 --- a/composer.json +++ b/composer.json @@ -80,7 +80,8 @@ "Neos.NodeTypes-20200120114136", "Neos.Flow-20200813181400", "Neos.Flow-20201003165200", - "Neos.Flow-20201109224100" + "Neos.Flow-20201109224100", + "Neos.Flow-20201205172733" ] } } \ No newline at end of file From bcd815bc9bac394582d67f13b7dcfa1dae09a235 Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Fri, 18 Dec 2020 16:12:31 +0100 Subject: [PATCH 20/20] TASK: Apply migration Neos.Flow-20201207104500 Adjust code to deprecation of ComponentContext/ComponentParameters Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a20e840..b679933 100644 --- a/composer.json +++ b/composer.json @@ -81,7 +81,8 @@ "Neos.Flow-20200813181400", "Neos.Flow-20201003165200", "Neos.Flow-20201109224100", - "Neos.Flow-20201205172733" + "Neos.Flow-20201205172733", + "Neos.Flow-20201207104500" ] } } \ No newline at end of file