From 9b92e22589ef685a55fb6fc11dac23a344138611 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Thu, 16 Feb 2017 22:00:51 +0100 Subject: [PATCH 01/19] edit composer.json for feature/neos-flow4 --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d849b12..18901b5 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "license": "MIT", "homepage": "https://github.com/digicomp/DigiComp.Sequence", "require": { - "typo3/flow": "~2.0|~3.0" + "neos/flow": "~4.0" }, "require-dev": { "phpunit/phpunit": "3.7.*", @@ -27,7 +27,8 @@ }, "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.1.x-dev", + "dev-feature/neos-flow4": "2.0.x-dev" }, "applied-flow-migrations": [ "Inwebs.Basket-201409170938", From 37d3856a3be0ecbf06a4a47bd6e24827024d2a5b Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Mon, 13 Mar 2017 16:59:04 +0100 Subject: [PATCH 02/19] update project; fit neos/flow 4 --- .../Command/SequenceCommandController.php | 17 ++--- .../DigiComp/Sequence/Domain/Model/Insert.php | 38 +++++------ .../DigiComp/Sequence/Service/Exception.php | 7 +- .../Sequence/Service/SequenceGenerator.php | 66 ++++++++++++------- Configuration/Testing/Settings.yaml | 4 +- Migrations/Mysql/Version20140505093853.php | 2 +- Migrations/Mysql/Version20160624203903.php | 2 +- Tests/Functional/SequenceTest.php | 23 ++++--- composer.json | 2 +- 9 files changed, 84 insertions(+), 77 deletions(-) diff --git a/Classes/DigiComp/Sequence/Command/SequenceCommandController.php b/Classes/DigiComp/Sequence/Command/SequenceCommandController.php index 4f55521..ebea1f6 100644 --- a/Classes/DigiComp/Sequence/Command/SequenceCommandController.php +++ b/Classes/DigiComp/Sequence/Command/SequenceCommandController.php @@ -1,13 +1,9 @@ sequenceGenerator->advanceTo($to, $type); } - //TODO: make clean up job to delete all but the biggest number to save resources + // TODO: make clean up job to delete all but the biggest number to save resources } diff --git a/Classes/DigiComp/Sequence/Domain/Model/Insert.php b/Classes/DigiComp/Sequence/Domain/Model/Insert.php index 2ebdc0a..31a9b6a 100644 --- a/Classes/DigiComp/Sequence/Domain/Model/Insert.php +++ b/Classes/DigiComp/Sequence/Domain/Model/Insert.php @@ -1,13 +1,8 @@ setType($type); $this->setNumber($number); + $this->setType($type); + } + + /** + * @return int + */ + public function getNumber() + { + return $this->number; } /** @@ -53,11 +55,11 @@ class Insert } /** - * @return int + * @return string */ - public function getNumber() + public function getType() { - return $this->number; + return $this->type; } /** @@ -70,12 +72,4 @@ class Insert } $this->type = $type; } - - /** - * @return string - */ - public function getType() - { - return $this->type; - } } diff --git a/Classes/DigiComp/Sequence/Service/Exception.php b/Classes/DigiComp/Sequence/Service/Exception.php index 6b21953..0a46197 100644 --- a/Classes/DigiComp/Sequence/Service/Exception.php +++ b/Classes/DigiComp/Sequence/Service/Exception.php @@ -1,12 +1,7 @@ 1 we could return new keys immediately for this * request, as we "reserved" the space between. * @@ -20,21 +19,20 @@ use TYPO3\Flow\Annotations as Flow; */ class SequenceGenerator { - /** - * @var \Doctrine\Common\Persistence\ObjectManager + * @var ObjectManager * @Flow\Inject */ protected $entityManager; /** - * @var \TYPO3\Flow\Reflection\ReflectionService + * @var ReflectionService * @Flow\Inject */ protected $reflectionService; /** - * @var \TYPO3\Flow\Log\SystemLoggerInterface + * @var SystemLoggerInterface * @Flow\Inject */ protected $systemLogger; @@ -42,7 +40,8 @@ class SequenceGenerator /** * @param string|object $type * - * @throws \DigiComp\Sequence\Service\Exception + * @throws Exception + * * @return int */ public function getNextNumberFor($type) @@ -50,18 +49,25 @@ class SequenceGenerator $type = $this->inferTypeFromSource($type); $count = $this->getLastNumberFor($type); - //TODO: Check for maximal tries, or similar - //TODO: Let increment be configurable per type + // TODO: Check for maximal tries, or similar + // TODO: Let increment be configurable per type do { - $count = $count + 1; - } while (!$this->validateFreeNumber($count, $type)); + $count++; + } while (! $this->validateFreeNumber($count, $type)); + return $count; } + /** + * @param int $count + * @param string|object $type + * + * @return bool + */ protected function validateFreeNumber($count, $type) { + /** @var $em EntityManager */ $em = $this->entityManager; - /** @var $em \Doctrine\ORM\EntityManager */ try { $em->getConnection()->insert( 'digicomp_sequence_domain_model_insert', @@ -73,18 +79,27 @@ class SequenceGenerator } catch (DBALException $e) { if ($e->getPrevious() && $e->getPrevious() instanceof \PDOException) { // Do nothing, new Doctrine handling hides the above error - } else { + } + else { $this->systemLogger->logException($e); } } catch (\Exception $e) { $this->systemLogger->logException($e); } + return false; } + /** + * @param int $to + * @param string|object $type + * + * @return bool + */ public function advanceTo($to, $type) { $type = $this->inferTypeFromSource($type); + return ($this->validateFreeNumber($to, $type)); } @@ -95,16 +110,16 @@ class SequenceGenerator */ public function getLastNumberFor($type) { - $type = $this->inferTypeFromSource($type); - /** @var $em \Doctrine\ORM\EntityManager */ + /** @var $em EntityManager */ $em = $this->entityManager; $result = $em->getConnection()->executeQuery( 'SELECT MAX(number) AS count FROM digicomp_sequence_domain_model_insert WHERE type=:type', - ['type' => $type] + ['type' => $this->inferTypeFromSource($type)] ); $count = $result->fetchAll(); $count = $count[0]['count']; + return $count; } @@ -112,15 +127,18 @@ class SequenceGenerator * @param string|object $stringOrObject * * @throws Exception + * * @return string */ - protected function inferTypeFromSource($stringOrObject) { + protected function inferTypeFromSource($stringOrObject) + { if (is_object($stringOrObject)) { - $stringOrObject = $this->reflectionService->getClassNameByObject($stringOrObject); + $stringOrObject = TypeHandling::getTypeForValue($stringOrObject); } - if (!$stringOrObject) { + if (! $stringOrObject) { throw new Exception('No Type given'); } + return $stringOrObject; } } diff --git a/Configuration/Testing/Settings.yaml b/Configuration/Testing/Settings.yaml index b72d1a0..54d2680 100644 --- a/Configuration/Testing/Settings.yaml +++ b/Configuration/Testing/Settings.yaml @@ -1,6 +1,6 @@ -TYPO3: +Neos: Flow: persistence: backendOptions: driver: 'pdo_sqlite' - path: %FLOW_PATH_DATA%/Temporary/testing.db \ No newline at end of file + path: '%FLOW_PATH_DATA%/Temporary/testing.db' diff --git a/Migrations/Mysql/Version20140505093853.php b/Migrations/Mysql/Version20140505093853.php index ad24715..d003d3a 100644 --- a/Migrations/Mysql/Version20140505093853.php +++ b/Migrations/Mysql/Version20140505093853.php @@ -1,5 +1,5 @@ assertEquals(0, $number); $this->assertEquals(1, $sequenceGenerator->getNextNumberFor($sequenceGenerator)); - $pids = []; + $pIds = []; for ($i = 0; $i < 10; $i++) { - $pid = pcntl_fork(); - if ($pid) { - $pids[] = $pid; - } else { + $pId = pcntl_fork(); + if ($pId) { + $pIds[] = $pId; + } + else { for ($j = 0; $j < 10; $j++) { $sequenceGenerator->getNextNumberFor($sequenceGenerator); } @@ -33,10 +36,12 @@ class SequenceTest extends FunctionalTestCase exit; } } - foreach ($pids as $pid) { + + foreach ($pIds as $pId) { $status = 0; - pcntl_waitpid($pid, $status); + pcntl_waitpid($pId, $status); } + $this->assertEquals(101, $sequenceGenerator->getLastNumberFor($sequenceGenerator)); } diff --git a/composer.json b/composer.json index 18901b5..2064416 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "digicomp/sequence", - "type": "typo3-flow-package", + "type": "neos-package", "description": "Sequence is a very simple database agnostic but database based sequence generator", "keywords": ["flow", "neos", "doctrine", "sequence"], "authors": [ From 0c912176bfa5c62be839628290d8e8d97da225dc Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 03/19] TASK: Apply migration TYPO3.Flow-20151113161300 Adjust "Settings.yaml" to new "requestPattern" and "firewall" syntax (see FLOW-412) 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 | 102 ++++++++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 48 deletions(-) diff --git a/composer.json b/composer.json index 2064416..1ca4230 100644 --- a/composer.json +++ b/composer.json @@ -1,51 +1,57 @@ { - "name": "digicomp/sequence", - "type": "neos-package", - "description": "Sequence is a very simple database agnostic but database based sequence generator", - "keywords": ["flow", "neos", "doctrine", "sequence"], - "authors": [ - { - "name": "Ferdinand Kuhl", - "email": "f.kuhl@digital-competence.de", - "homepage": "http://www.digital-competence.de", - "role": "Developer" - } - ], - "license": "MIT", - "homepage": "https://github.com/digicomp/DigiComp.Sequence", - "require": { - "neos/flow": "~4.0" - }, - "require-dev": { - "phpunit/phpunit": "3.7.*", - "ext-pcntl": "*" - }, - "autoload": { - "psr-0": { - "DigiComp\\Sequence": "Classes" - } - }, - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev", - "dev-feature/neos-flow4": "2.0.x-dev" + "name": "digicomp/sequence", + "type": "neos-package", + "description": "Sequence is a very simple database agnostic but database based sequence generator", + "keywords": [ + "flow", + "neos", + "doctrine", + "sequence" + ], + "authors": [ + { + "name": "Ferdinand Kuhl", + "email": "f.kuhl@digital-competence.de", + "homepage": "http://www.digital-competence.de", + "role": "Developer" + } + ], + "license": "MIT", + "homepage": "https://github.com/digicomp/DigiComp.Sequence", + "require": { + "neos/flow": "~4.0" }, - "applied-flow-migrations": [ - "Inwebs.Basket-201409170938", - "TYPO3.FLOW3-201201261636", - "TYPO3.Fluid-201205031303", - "TYPO3.FLOW3-201205292145", - "TYPO3.FLOW3-201206271128", - "TYPO3.FLOW3-201209201112", - "TYPO3.Flow-201209251426", - "TYPO3.Flow-201211151101", - "TYPO3.Flow-201212051340", - "TYPO3.Flow-201310031523", - "TYPO3.Flow-201405111147", - "TYPO3.Fluid-20141113120800", - "TYPO3.Flow-20141113121400", - "TYPO3.Fluid-20141121091700", - "TYPO3.Fluid-20150214130800" - ] - } + "require-dev": { + "phpunit/phpunit": "3.7.*", + "ext-pcntl": "*" + }, + "autoload": { + "psr-0": { + "DigiComp\\Sequence": "Classes" + } + }, + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev", + "dev-feature/neos-flow4": "2.0.x-dev" + }, + "applied-flow-migrations": [ + "Inwebs.Basket-201409170938", + "TYPO3.FLOW3-201201261636", + "TYPO3.Fluid-201205031303", + "TYPO3.FLOW3-201205292145", + "TYPO3.FLOW3-201206271128", + "TYPO3.FLOW3-201209201112", + "TYPO3.Flow-201209251426", + "TYPO3.Flow-201211151101", + "TYPO3.Flow-201212051340", + "TYPO3.Flow-201310031523", + "TYPO3.Flow-201405111147", + "TYPO3.Fluid-20141113120800", + "TYPO3.Flow-20141113121400", + "TYPO3.Fluid-20141121091700", + "TYPO3.Fluid-20150214130800", + "TYPO3.Flow-20151113161300" + ] + } } \ No newline at end of file From 44c984e2fa14d1e5a821ff2708a0359ba935e231 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 04/19] TASK: Apply migration TYPO3.Flow-20161115140400 Adjust to the renaming of the Resource namespace and class in Flow 4.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 1ca4230..d120712 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,8 @@ "TYPO3.Flow-20141113121400", "TYPO3.Fluid-20141121091700", "TYPO3.Fluid-20150214130800", - "TYPO3.Flow-20151113161300" + "TYPO3.Flow-20151113161300", + "TYPO3.Flow-20161115140400" ] } } \ No newline at end of file From 73cabc5672cd79bef06c487a33aa7405f3655bf1 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 05/19] TASK: Apply migration TYPO3.Flow-20161115140430 Adjust to the renaming of the Object namespace in Flow 4.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 d120712..1cb23d6 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,8 @@ "TYPO3.Fluid-20141121091700", "TYPO3.Fluid-20150214130800", "TYPO3.Flow-20151113161300", - "TYPO3.Flow-20161115140400" + "TYPO3.Flow-20161115140400", + "TYPO3.Flow-20161115140430" ] } } \ No newline at end of file From 8364b273cf22e5f4637ff434747a12fd815889fc Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 06/19] TASK: Apply migration Neos.Flow-20161124204700 Adjusts code to package renaming from "TYPO3.Flow" to "Neos.Flow" 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 1cb23d6..f91c95d 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,8 @@ "TYPO3.Fluid-20150214130800", "TYPO3.Flow-20151113161300", "TYPO3.Flow-20161115140400", - "TYPO3.Flow-20161115140430" + "TYPO3.Flow-20161115140430", + "Neos.Flow-20161124204700" ] } } \ No newline at end of file From b84620b6c30ecaf46c5bfcde84179c02cd46e66a Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 07/19] TASK: Apply migration Neos.Flow-20161124204701 Adjusts code to package renaming from "Neos.Flow.Utility.Files" to "Neos.Utility.Files" and other extractions of the "Utility" packages. 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 f91c95d..d4c584e 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,8 @@ "TYPO3.Flow-20151113161300", "TYPO3.Flow-20161115140400", "TYPO3.Flow-20161115140430", - "Neos.Flow-20161124204700" + "Neos.Flow-20161124204700", + "Neos.Flow-20161124204701" ] } } \ No newline at end of file From 777920d40faaadb5d1d3d73b020f22db522957d1 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 08/19] TASK: Apply migration Neos.Flow-20161124224015 Adjusts code to cache extraction 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 d4c584e..c5ebcb9 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,8 @@ "TYPO3.Flow-20161115140400", "TYPO3.Flow-20161115140430", "Neos.Flow-20161124204700", - "Neos.Flow-20161124204701" + "Neos.Flow-20161124204701", + "Neos.Flow-20161124224015" ] } } \ No newline at end of file From f4c36abc697899e3abb4cc698b3e623f95483443 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 09/19] TASK: Apply migration Neos.Eel-20161124230101 Adjusts code to Eel Renaming 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 c5ebcb9..d53a587 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,8 @@ "TYPO3.Flow-20161115140430", "Neos.Flow-20161124204700", "Neos.Flow-20161124204701", - "Neos.Flow-20161124224015" + "Neos.Flow-20161124224015", + "Neos.Eel-20161124230101" ] } } \ No newline at end of file From aa0508f9d048b590d548a1f7db28dc2a737647e8 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 10/19] TASK: Apply migration Neos.Imagine-20161124231742 Adjusts code to Imagine Renaming 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 d53a587..d553099 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,8 @@ "Neos.Flow-20161124204700", "Neos.Flow-20161124204701", "Neos.Flow-20161124224015", - "Neos.Eel-20161124230101" + "Neos.Eel-20161124230101", + "Neos.Imagine-20161124231742" ] } } \ No newline at end of file From 33a2f4e880fc30f8606db65d8a582f809bb344d6 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 11/19] TASK: Apply migration Neos.Media-20161124233100 Adjusts code to package renaming from "TYPO3.Media" to "Neos.Media" 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 d553099..3b9095c 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,8 @@ "Neos.Flow-20161124204701", "Neos.Flow-20161124224015", "Neos.Eel-20161124230101", - "Neos.Imagine-20161124231742" + "Neos.Imagine-20161124231742", + "Neos.Media-20161124233100" ] } } \ No newline at end of file From 9da615e46caa2e12628e9203fc0ac1d3ec3f6ceb Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 12/19] TASK: Apply migration Neos.Flow-20161125124112 Adjusts code to Neos\Flow\Utility\Unicode adjustment 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 3b9095c..549fd4f 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,8 @@ "Neos.Flow-20161124224015", "Neos.Eel-20161124230101", "Neos.Imagine-20161124231742", - "Neos.Media-20161124233100" + "Neos.Media-20161124233100", + "Neos.Flow-20161125124112" ] } } \ No newline at end of file From f3be919a57ef9a42d6cf3e2b718c5d4b7ed8811a Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 13/19] 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 549fd4f..e2079fc 100644 --- a/composer.json +++ b/composer.json @@ -60,7 +60,8 @@ "Neos.Eel-20161124230101", "Neos.Imagine-20161124231742", "Neos.Media-20161124233100", - "Neos.Flow-20161125124112" + "Neos.Flow-20161125124112", + "Neos.SwiftMailer-20161130105617" ] } } \ No newline at end of file From 464380e18d9c2dbc67e9e64497db1f96db2d8982 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 14/19] TASK: Apply migration TYPO3.FluidAdaptor-20161130112935 Adjusts code to package renaming from "TYPO3.Fluid" to "Neos.FluidAdaptor". 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 e2079fc..fa85bcd 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,8 @@ "Neos.Imagine-20161124231742", "Neos.Media-20161124233100", "Neos.Flow-20161125124112", - "Neos.SwiftMailer-20161130105617" + "Neos.SwiftMailer-20161130105617", + "TYPO3.FluidAdaptor-20161130112935" ] } } \ No newline at end of file From bb8d35a1320a7207f83a75b629775fc658bee6fb Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 15/19] TASK: Apply migration Neos.Media-20161219094126 Migrate name for the media image size cache 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 fa85bcd..5d5ea64 100644 --- a/composer.json +++ b/composer.json @@ -62,7 +62,8 @@ "Neos.Media-20161124233100", "Neos.Flow-20161125124112", "Neos.SwiftMailer-20161130105617", - "TYPO3.FluidAdaptor-20161130112935" + "TYPO3.FluidAdaptor-20161130112935", + "Neos.Media-20161219094126" ] } } \ No newline at end of file From dae7f83338e95771f4b1857d4f88d36bce143e32 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 16/19] TASK: Apply migration Neos.Flow-20170125103800 Migrate usages of the path [TYPO3][Flow][Security][Authentication] to [Neos][Flow][Security][Authentication] 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 5d5ea64..0bf9aec 100644 --- a/composer.json +++ b/composer.json @@ -63,7 +63,8 @@ "Neos.Flow-20161125124112", "Neos.SwiftMailer-20161130105617", "TYPO3.FluidAdaptor-20161130112935", - "Neos.Media-20161219094126" + "Neos.Media-20161219094126", + "Neos.Flow-20170125103800" ] } } \ No newline at end of file From 71cf52d80eca40187f16fabf5628f51523097b67 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 15 Mar 2017 09:06:44 +0100 Subject: [PATCH 17/19] TASK: Apply migration Neos.Flow-20170127183102 Migrate bootstep names. 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 0bf9aec..ad44ea6 100644 --- a/composer.json +++ b/composer.json @@ -64,7 +64,8 @@ "Neos.SwiftMailer-20161130105617", "TYPO3.FluidAdaptor-20161130112935", "Neos.Media-20161219094126", - "Neos.Flow-20170125103800" + "Neos.Flow-20170125103800", + "Neos.Flow-20170127183102" ] } } \ No newline at end of file From cda0def3351e89da00dd8357b5586e18591b2331 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 24 May 2017 14:02:27 +0200 Subject: [PATCH 18/19] TASK: Raise flow version constraint --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index ad44ea6..9189310 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "license": "MIT", "homepage": "https://github.com/digicomp/DigiComp.Sequence", "require": { - "neos/flow": "~4.0" + "neos/flow": "~4.1" }, "require-dev": { "phpunit/phpunit": "3.7.*", @@ -68,4 +68,4 @@ "Neos.Flow-20170127183102" ] } -} \ No newline at end of file +} From 6a851fac6169d18007a5518476edcf7fbdbe4791 Mon Sep 17 00:00:00 2001 From: Ferdinand Kuhl Date: Wed, 23 Aug 2017 10:36:28 +0200 Subject: [PATCH 19/19] TASK: PSR4 only --- .../Sequence => }/Command/SequenceCommandController.php | 0 Classes/{DigiComp/Sequence => }/Domain/Model/Insert.php | 0 Classes/{DigiComp/Sequence => }/Service/Exception.php | 0 Classes/{DigiComp/Sequence => }/Service/SequenceGenerator.php | 0 composer.json | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename Classes/{DigiComp/Sequence => }/Command/SequenceCommandController.php (100%) rename Classes/{DigiComp/Sequence => }/Domain/Model/Insert.php (100%) rename Classes/{DigiComp/Sequence => }/Service/Exception.php (100%) rename Classes/{DigiComp/Sequence => }/Service/SequenceGenerator.php (100%) diff --git a/Classes/DigiComp/Sequence/Command/SequenceCommandController.php b/Classes/Command/SequenceCommandController.php similarity index 100% rename from Classes/DigiComp/Sequence/Command/SequenceCommandController.php rename to Classes/Command/SequenceCommandController.php diff --git a/Classes/DigiComp/Sequence/Domain/Model/Insert.php b/Classes/Domain/Model/Insert.php similarity index 100% rename from Classes/DigiComp/Sequence/Domain/Model/Insert.php rename to Classes/Domain/Model/Insert.php diff --git a/Classes/DigiComp/Sequence/Service/Exception.php b/Classes/Service/Exception.php similarity index 100% rename from Classes/DigiComp/Sequence/Service/Exception.php rename to Classes/Service/Exception.php diff --git a/Classes/DigiComp/Sequence/Service/SequenceGenerator.php b/Classes/Service/SequenceGenerator.php similarity index 100% rename from Classes/DigiComp/Sequence/Service/SequenceGenerator.php rename to Classes/Service/SequenceGenerator.php diff --git a/composer.json b/composer.json index 9189310..d0a7d63 100644 --- a/composer.json +++ b/composer.json @@ -26,8 +26,8 @@ "ext-pcntl": "*" }, "autoload": { - "psr-0": { - "DigiComp\\Sequence": "Classes" + "psr-4": { + "DigiComp\\Sequence\\": "Classes" } }, "extra": {