From bbfe5b60fe586c283a6963613f9668c70702a2ed Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Thu, 30 Apr 2020 11:09:02 -0600 Subject: [PATCH 1/9] Added default_document_repository_class_name to document manager configuration --- .../Options/Configuration.php | 16 ++++++++++++++++ .../Service/ConfigurationFactory.php | 5 +++++ .../Assets/DefaultDocumentRepository.php | 15 +++++++++++++++ .../Doctrine/ConfigurationFactoryTest.php | 7 +++++-- 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 tests/DoctrineMongoODMModuleTest/Assets/DefaultDocumentRepository.php diff --git a/src/DoctrineMongoODMModule/Options/Configuration.php b/src/DoctrineMongoODMModule/Options/Configuration.php index 7c576b7..4ed797f 100644 --- a/src/DoctrineMongoODMModule/Options/Configuration.php +++ b/src/DoctrineMongoODMModule/Options/Configuration.php @@ -5,6 +5,7 @@ namespace DoctrineMongoODMModule\Options; use Doctrine\Common\Proxy\AbstractProxyFactory; +use Doctrine\ODM\MongoDB\Repository\DocumentRepository as DefaultDocumentRepository; use DoctrineMongoODMModule\Logging\Logger; use Laminas\Stdlib\AbstractOptions; use function is_bool; @@ -125,6 +126,9 @@ class Configuration extends AbstractOptions /** @var string */ protected $repositoryFactory; + /** @var string */ + protected $defaultDocumentRepositoryClassName; + /** * Number of times to attempt to connect if an exception is encountered * @@ -471,4 +475,16 @@ public function setRepositoryFactory(?string $repositoryFactory) : Configuration return $this; } + + public function getDefaultDocumentRepositoryClassName() + { + return $this->defaultDocumentRepositoryClassName; + } + + public function setDefaultDocumentRepositoryClassName(string $defaultDocumentRepositoryClassName) + { + $this->defaultDocumentRepositoryClassName = $defaultDocumentRepositoryClassName; + + return $this; + } } diff --git a/src/DoctrineMongoODMModule/Service/ConfigurationFactory.php b/src/DoctrineMongoODMModule/Service/ConfigurationFactory.php index 2447e8b..235b77b 100644 --- a/src/DoctrineMongoODMModule/Service/ConfigurationFactory.php +++ b/src/DoctrineMongoODMModule/Service/ConfigurationFactory.php @@ -98,6 +98,11 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $ } } + $className = $options->getDefaultDocumentRepositoryClassName(); + if ($className) { + $config->setDefaultDocumentRepositoryClassName($className); + } + return $config; } diff --git a/tests/DoctrineMongoODMModuleTest/Assets/DefaultDocumentRepository.php b/tests/DoctrineMongoODMModuleTest/Assets/DefaultDocumentRepository.php new file mode 100644 index 0000000..ca64e9b --- /dev/null +++ b/tests/DoctrineMongoODMModuleTest/Assets/DefaultDocumentRepository.php @@ -0,0 +1,15 @@ +setService('stubbed_logger', $this->getMockForAbstractClass(Logger::class)); $serviceLocator->setService( @@ -97,6 +97,7 @@ public function testCreation() : void 'types' => [$typeName = 'foo_type' => $typeClassName = CustomType::class], 'classMetadataFactoryName' => 'stdClass', 'repositoryFactory' => CustomRepositoryFactory::class, + 'default_document_repository_class_name' => CustomDocumentRepository::class, ], ], ], @@ -104,8 +105,8 @@ public function testCreation() : void ); $factory = new ConfigurationFactory('odm_test'); - $config = $factory->createService($serviceLocator); + assert($config instanceof Configuration); self::assertInstanceOf(Configuration::class, $config); @@ -130,5 +131,7 @@ public function testCreation() : void self::assertInstanceOf($typeClassName, Type::getType($typeName)); self::assertSame($repositoryFactory, $config->getRepositoryFactory()); + + self::assertSame(CustomDocumentRepository::class, $config->getDefaultDocumentRepositoryClassName()); } } From 9c0731c3b17131d9296231eeee8ff4e5004ec6c3 Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Thu, 30 Apr 2020 11:12:29 -0600 Subject: [PATCH 2/9] Set default for defaultDocumentRepositoryClassName --- src/DoctrineMongoODMModule/Options/Configuration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DoctrineMongoODMModule/Options/Configuration.php b/src/DoctrineMongoODMModule/Options/Configuration.php index 4ed797f..ab29f75 100644 --- a/src/DoctrineMongoODMModule/Options/Configuration.php +++ b/src/DoctrineMongoODMModule/Options/Configuration.php @@ -127,7 +127,7 @@ class Configuration extends AbstractOptions protected $repositoryFactory; /** @var string */ - protected $defaultDocumentRepositoryClassName; + protected $defaultDocumentRepositoryClassName = DefaultDocumentRepository::class; /** * Number of times to attempt to connect if an exception is encountered From 013a0dfcbf304ae6f0e6a0ad8ee2d4a86eaf7e02 Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Thu, 30 Apr 2020 11:15:39 -0600 Subject: [PATCH 3/9] Added default_document_repository_class_name to custom config --- config/module.doctrine-mongo-odm.local.php.dist | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/module.doctrine-mongo-odm.local.php.dist b/config/module.doctrine-mongo-odm.local.php.dist index 024400d..b87e261 100644 --- a/config/module.doctrine-mongo-odm.local.php.dist +++ b/config/module.doctrine-mongo-odm.local.php.dist @@ -1,5 +1,6 @@ array( @@ -40,7 +41,9 @@ return array( // // 'filters' => array(), // array('filterName' => 'BSON\Filter\Class'), // -// 'logger' => null // 'DoctrineMongoODMModule\Logging\DebugStack' +// 'logger' => null // 'DoctrineMongoODMModule\Logging\DebugStack', +// +// 'default_document_repository_class_name' => DefaultDocumentRepository::class, ) ), From 472d86ea220eeabf85572939ca31c77f994cffba Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Thu, 30 Apr 2020 11:35:07 -0600 Subject: [PATCH 4/9] Added test to ensure custom repository is used --- .../Doctrine/CustomDefaultRepositoryTest.php | 21 +++++++++++++++++++ tests/testing.config.php | 5 +++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 tests/DoctrineMongoODMModuleTest/Doctrine/CustomDefaultRepositoryTest.php diff --git a/tests/DoctrineMongoODMModuleTest/Doctrine/CustomDefaultRepositoryTest.php b/tests/DoctrineMongoODMModuleTest/Doctrine/CustomDefaultRepositoryTest.php new file mode 100644 index 0000000..6630faf --- /dev/null +++ b/tests/DoctrineMongoODMModuleTest/Doctrine/CustomDefaultRepositoryTest.php @@ -0,0 +1,21 @@ +getDocumentManager(); + + $repository = $documentManager->getRepository(Simple::class); + + self::assertInstanceOf(DefaultDocumentRepository::class, $repository); + } +} diff --git a/tests/testing.config.php b/tests/testing.config.php index 655b75f..12d5190 100644 --- a/tests/testing.config.php +++ b/tests/testing.config.php @@ -1,6 +1,6 @@ - [ @@ -9,6 +9,7 @@ 'default_db' => 'doctrineMongoODMModuleTest', 'retryConnect' => 123, 'retryQuery' => 456, + 'default_document_repository_class_name' => Assets\DefaultDocumentRepository ::class, ], ], 'connection' => [ From ff16c6f1ca2604641359e218b250a228293700e0 Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Thu, 30 Apr 2020 11:38:08 -0600 Subject: [PATCH 5/9] Assertion to check custom repository function --- .../Doctrine/CustomDefaultRepositoryTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/DoctrineMongoODMModuleTest/Doctrine/CustomDefaultRepositoryTest.php b/tests/DoctrineMongoODMModuleTest/Doctrine/CustomDefaultRepositoryTest.php index 6630faf..dbce76a 100644 --- a/tests/DoctrineMongoODMModuleTest/Doctrine/CustomDefaultRepositoryTest.php +++ b/tests/DoctrineMongoODMModuleTest/Doctrine/CustomDefaultRepositoryTest.php @@ -17,5 +17,6 @@ public function testCustomDefaultRepository() : void $repository = $documentManager->getRepository(Simple::class); self::assertInstanceOf(DefaultDocumentRepository::class, $repository); + self::assertTrue($repository->isCustomDefaultDocumentRepository()); } } From 470efedfbb712ebb7ce52393c91650dd3e6cf3f1 Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Thu, 30 Apr 2020 11:40:55 -0600 Subject: [PATCH 6/9] Format strict types to first line --- .../Assets/DefaultDocumentRepository.php | 4 +--- .../Doctrine/CustomDefaultRepositoryTest.php | 4 +--- tests/testing.config.php | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/DoctrineMongoODMModuleTest/Assets/DefaultDocumentRepository.php b/tests/DoctrineMongoODMModuleTest/Assets/DefaultDocumentRepository.php index ca64e9b..89f9ae6 100644 --- a/tests/DoctrineMongoODMModuleTest/Assets/DefaultDocumentRepository.php +++ b/tests/DoctrineMongoODMModuleTest/Assets/DefaultDocumentRepository.php @@ -1,6 +1,4 @@ - 'doctrineMongoODMModuleTest', 'retryConnect' => 123, 'retryQuery' => 456, - 'default_document_repository_class_name' => Assets\DefaultDocumentRepository ::class, + 'default_document_repository_class_name' => Assets\DefaultDocumentRepository::class, ], ], 'connection' => [ From 63affdafd07f9256db82594e172b76f4073ffad8 Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Thu, 30 Apr 2020 12:08:36 -0600 Subject: [PATCH 7/9] phpcs fixes --- src/DoctrineMongoODMModule/Options/Configuration.php | 4 ++-- .../Service/MongoLoggerCollectorFactory.php | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/DoctrineMongoODMModule/Options/Configuration.php b/src/DoctrineMongoODMModule/Options/Configuration.php index ab29f75..d5bc580 100644 --- a/src/DoctrineMongoODMModule/Options/Configuration.php +++ b/src/DoctrineMongoODMModule/Options/Configuration.php @@ -476,12 +476,12 @@ public function setRepositoryFactory(?string $repositoryFactory) : Configuration return $this; } - public function getDefaultDocumentRepositoryClassName() + public function getDefaultDocumentRepositoryClassName() : string { return $this->defaultDocumentRepositoryClassName; } - public function setDefaultDocumentRepositoryClassName(string $defaultDocumentRepositoryClassName) + public function setDefaultDocumentRepositoryClassName(string $defaultDocumentRepositoryClassName) : self { $this->defaultDocumentRepositoryClassName = $defaultDocumentRepositoryClassName; diff --git a/src/DoctrineMongoODMModule/Service/MongoLoggerCollectorFactory.php b/src/DoctrineMongoODMModule/Service/MongoLoggerCollectorFactory.php index 734dd2a..e955966 100644 --- a/src/DoctrineMongoODMModule/Service/MongoLoggerCollectorFactory.php +++ b/src/DoctrineMongoODMModule/Service/MongoLoggerCollectorFactory.php @@ -68,9 +68,6 @@ public function createService(ServiceLocatorInterface $container) return $this($container, MongoLoggerCollector::class); } - /** - * {@inheritDoc} - */ public function getOptionsClass() : string { return Options\MongoLoggerCollector::class; From db6bbb37132d82337e055557aaa0f53a23fe9aa6 Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Fri, 1 May 2020 07:15:13 -0600 Subject: [PATCH 8/9] Up'd mongo-odm to ^1.3 --- composer.json | 2 +- composer.lock | 277 +++++++++++++++++++++++++------------------------- 2 files changed, 142 insertions(+), 137 deletions(-) diff --git a/composer.json b/composer.json index 6560713..5583bc4 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,7 @@ "php": "^7.2", "alcaeus/mongo-php-adapter": "^1.1", "doctrine/doctrine-module": "^4.0", - "doctrine/mongodb-odm": "^1.1", + "doctrine/mongodb-odm": "^1.3", "laminas/laminas-hydrator": "^3.0.2", "laminas/laminas-mvc": "^3.1.1", "laminas/laminas-servicemanager": "^3.4", diff --git a/composer.lock b/composer.lock index e8076d5..ed0d00e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a59b10946d63facb69dc0ddfad123b4d", + "content-hash": "88ef9c2c94f30dc6258dc6fa8f15d0c6", "packages": [ { "name": "alcaeus/mongo-php-adapter", @@ -106,20 +106,21 @@ }, { "name": "doctrine/annotations", - "version": "v1.8.0", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc" + "reference": "b9d758e831c70751155c698c2f7df4665314a1cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/904dca4eb10715b92569fbcd79e201d5c349b6bc", - "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/b9d758e831c70751155c698c2f7df4665314a1cb", + "reference": "b9d758e831c70751155c698c2f7df4665314a1cb", "shasum": "" }, "require": { "doctrine/lexer": "1.*", + "ext-tokenizer": "*", "php": "^7.1" }, "require-dev": { @@ -129,7 +130,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev" + "dev-master": "1.9.x-dev" } }, "autoload": { @@ -170,7 +171,7 @@ "docblock", "parser" ], - "time": "2019-10-01T18:55:10+00:00" + "time": "2020-04-20T09:18:32+00:00" }, { "name": "doctrine/cache", @@ -461,22 +462,23 @@ }, { "name": "doctrine/doctrine-module", - "version": "4.0.1", + "version": "4.0.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineModule.git", - "reference": "570a915b5de014c94c01633622f7d34ad500f640" + "reference": "6b13045c2bd70e73d1b9497ef64b66f6abeec1ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineModule/zipball/570a915b5de014c94c01633622f7d34ad500f640", - "reference": "570a915b5de014c94c01633622f7d34ad500f640", + "url": "https://api.github.com/repos/doctrine/DoctrineModule/zipball/6b13045c2bd70e73d1b9497ef64b66f6abeec1ec", + "reference": "6b13045c2bd70e73d1b9497ef64b66f6abeec1ec", "shasum": "" }, "require": { "doctrine/cache": "^1.7", "doctrine/common": "^2.8", "doctrine/doctrine-laminas-hydrator": "^2.0.2", + "doctrine/persistence": "^1.3.7", "laminas/laminas-authentication": "^2.5.3", "laminas/laminas-cache": "^2.7.1", "laminas/laminas-form": "^2.11", @@ -561,7 +563,7 @@ "laminas", "module" ], - "time": "2020-02-19T17:36:36+00:00" + "time": "2020-04-09T05:25:24+00:00" }, { "name": "doctrine/event-manager", @@ -988,16 +990,16 @@ }, { "name": "doctrine/persistence", - "version": "1.3.6", + "version": "1.3.7", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "5dd3ac5eebef2d0b074daa4440bb18f93132dee4" + "reference": "0af483f91bada1c9ded6c2cfd26ab7d5ab2094e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/5dd3ac5eebef2d0b074daa4440bb18f93132dee4", - "reference": "5dd3ac5eebef2d0b074daa4440bb18f93132dee4", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/0af483f91bada1c9ded6c2cfd26ab7d5ab2094e0", + "reference": "0af483f91bada1c9ded6c2cfd26ab7d5ab2094e0", "shasum": "" }, "require": { @@ -1005,7 +1007,7 @@ "doctrine/cache": "^1.0", "doctrine/collections": "^1.0", "doctrine/event-manager": "^1.0", - "doctrine/reflection": "^1.1", + "doctrine/reflection": "^1.2", "php": "^7.1" }, "conflict": { @@ -1067,20 +1069,20 @@ "orm", "persistence" ], - "time": "2020-01-16T22:06:23+00:00" + "time": "2020-03-21T15:13:52+00:00" }, { "name": "doctrine/reflection", - "version": "v1.1.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/reflection.git", - "reference": "bc420ead87fdfe08c03ecc3549db603a45b06d4c" + "reference": "55e71912dfcd824b2fdd16f2d9afe15684cfce79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/reflection/zipball/bc420ead87fdfe08c03ecc3549db603a45b06d4c", - "reference": "bc420ead87fdfe08c03ecc3549db603a45b06d4c", + "url": "https://api.github.com/repos/doctrine/reflection/zipball/55e71912dfcd824b2fdd16f2d9afe15684cfce79", + "reference": "55e71912dfcd824b2fdd16f2d9afe15684cfce79", "shasum": "" }, "require": { @@ -1101,7 +1103,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -1145,7 +1147,7 @@ "reflection", "static" ], - "time": "2020-01-08T19:53:19+00:00" + "time": "2020-03-27T11:06:43+00:00" }, { "name": "laminas/laminas-authentication", @@ -1473,16 +1475,16 @@ }, { "name": "laminas/laminas-filter", - "version": "2.9.3", + "version": "2.9.4", "source": { "type": "git", "url": "https://github.com/laminas/laminas-filter.git", - "reference": "52b5cdbef8902280996e687e7352a648a8e22f31" + "reference": "3c4476e772a062cef7531c6793377ae585d89c82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/52b5cdbef8902280996e687e7352a648a8e22f31", - "reference": "52b5cdbef8902280996e687e7352a648a8e22f31", + "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/3c4476e772a062cef7531c6793377ae585d89c82", + "reference": "3c4476e772a062cef7531c6793377ae585d89c82", "shasum": "" }, "require": { @@ -1494,7 +1496,7 @@ "laminas/laminas-validator": "<2.10.1" }, "replace": { - "zendframework/zend-filter": "self.version" + "zendframework/zend-filter": "^2.9.2" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", @@ -1538,20 +1540,20 @@ "filter", "laminas" ], - "time": "2020-01-07T20:43:53+00:00" + "time": "2020-03-29T12:41:29+00:00" }, { "name": "laminas/laminas-form", - "version": "2.14.3", + "version": "2.14.5", "source": { "type": "git", "url": "https://github.com/laminas/laminas-form.git", - "reference": "012aae01366cb8c8fb64e39a887363ef82f388dd" + "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-form/zipball/012aae01366cb8c8fb64e39a887363ef82f388dd", - "reference": "012aae01366cb8c8fb64e39a887363ef82f388dd", + "url": "https://api.github.com/repos/laminas/laminas-form/zipball/3e22e09751cf6ae031be87a44e092e7925ce5b7b", + "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b", "shasum": "" }, "require": { @@ -1562,7 +1564,7 @@ "php": "^5.6 || ^7.0" }, "replace": { - "zendframework/zend-form": "self.version" + "zendframework/zend-form": "^2.14.3" }, "require-dev": { "doctrine/annotations": "~1.0", @@ -1580,7 +1582,7 @@ "laminas/laminas-text": "^2.6", "laminas/laminas-validator": "^2.6", "laminas/laminas-view": "^2.6.2", - "phpunit/phpunit": "^5.7.23 || ^6.5.3" + "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20" }, "suggest": { "laminas/laminas-captcha": "^2.7.1, required for using CAPTCHA form elements", @@ -1620,7 +1622,7 @@ "form", "laminas" ], - "time": "2019-12-31T16:56:34+00:00" + "time": "2020-03-29T12:46:16+00:00" }, { "name": "laminas/laminas-http", @@ -2120,16 +2122,16 @@ }, { "name": "laminas/laminas-router", - "version": "3.3.1", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/laminas/laminas-router.git", - "reference": "c94f13f39dfbc4313efdbfcd9772487b4b009026" + "reference": "01a6905202ad41a42ba63d60260eba32b89e18c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-router/zipball/c94f13f39dfbc4313efdbfcd9772487b4b009026", - "reference": "c94f13f39dfbc4313efdbfcd9772487b4b009026", + "url": "https://api.github.com/repos/laminas/laminas-router/zipball/01a6905202ad41a42ba63d60260eba32b89e18c7", + "reference": "01a6905202ad41a42ba63d60260eba32b89e18c7", "shasum": "" }, "require": { @@ -2144,7 +2146,7 @@ "laminas/laminas-mvc": "<3.0.0" }, "replace": { - "zendframework/zend-router": "self.version" + "zendframework/zend-router": "^3.3.0" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", @@ -2181,7 +2183,7 @@ "mvc", "routing" ], - "time": "2020-01-03T17:19:34+00:00" + "time": "2020-03-29T13:21:03+00:00" }, { "name": "laminas/laminas-servicemanager", @@ -2358,16 +2360,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.13.1", + "version": "2.13.4", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "36702f033486bf1953e254f5299aad205302e79d" + "reference": "93593684e70b8ed1e870cacd34ca32b0c0ace185" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/36702f033486bf1953e254f5299aad205302e79d", - "reference": "36702f033486bf1953e254f5299aad205302e79d", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/93593684e70b8ed1e870cacd34ca32b0c0ace185", + "reference": "93593684e70b8ed1e870cacd34ca32b0c0ace185", "shasum": "" }, "require": { @@ -2377,7 +2379,7 @@ "php": "^7.1" }, "replace": { - "zendframework/zend-validator": "self.version" + "zendframework/zend-validator": "^2.13.0" }, "require-dev": { "laminas/laminas-cache": "^2.6.1", @@ -2433,7 +2435,7 @@ "laminas", "validator" ], - "time": "2020-01-15T09:59:30+00:00" + "time": "2020-03-31T18:57:01+00:00" }, { "name": "laminas/laminas-view", @@ -2528,16 +2530,16 @@ }, { "name": "laminas/laminas-zendframework-bridge", - "version": "1.0.1", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/laminas/laminas-zendframework-bridge.git", - "reference": "0fb9675b84a1666ab45182b6c5b29956921e818d" + "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/0fb9675b84a1666ab45182b6c5b29956921e818d", - "reference": "0fb9675b84a1666ab45182b6c5b29956921e818d", + "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9", + "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9", "shasum": "" }, "require": { @@ -2576,7 +2578,7 @@ "laminas", "zf" ], - "time": "2020-01-07T22:58:31+00:00" + "time": "2020-04-03T16:01:00+00:00" }, { "name": "mongodb/mongodb", @@ -2791,16 +2793,16 @@ }, { "name": "symfony/console", - "version": "v5.0.5", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d29e2d36941de13600c399e393a60b8cfe59ac49" + "reference": "5fa1caadc8cdaa17bcfb25219f3b53fe294a9935" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d29e2d36941de13600c399e393a60b8cfe59ac49", - "reference": "d29e2d36941de13600c399e393a60b8cfe59ac49", + "url": "https://api.github.com/repos/symfony/console/zipball/5fa1caadc8cdaa17bcfb25219f3b53fe294a9935", + "reference": "5fa1caadc8cdaa17bcfb25219f3b53fe294a9935", "shasum": "" }, "require": { @@ -2863,20 +2865,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2020-02-24T15:05:31+00:00" + "time": "2020-03-30T11:42:42+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.14.0", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2" + "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2", - "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac", + "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac", "shasum": "" }, "require": { @@ -2888,7 +2890,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -2922,20 +2924,20 @@ "portable", "shim" ], - "time": "2020-01-13T11:15:53+00:00" + "time": "2020-03-09T19:04:49+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.14.0", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "5e66a0fa1070bf46bec4bea7962d285108edd675" + "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/5e66a0fa1070bf46bec4bea7962d285108edd675", - "reference": "5e66a0fa1070bf46bec4bea7962d285108edd675", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7", + "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7", "shasum": "" }, "require": { @@ -2944,7 +2946,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -2980,7 +2982,7 @@ "portable", "shim" ], - "time": "2020-01-13T11:15:53+00:00" + "time": "2020-02-27T09:26:54+00:00" }, { "name": "symfony/service-contracts", @@ -3228,16 +3230,16 @@ }, { "name": "laminas/laminas-i18n", - "version": "2.10.1", + "version": "2.10.3", "source": { "type": "git", "url": "https://github.com/laminas/laminas-i18n.git", - "reference": "815be447f1c77f70a86bf24d00087fcb975b39ff" + "reference": "94ff957a1366f5be94f3d3a9b89b50386649e3ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/815be447f1c77f70a86bf24d00087fcb975b39ff", - "reference": "815be447f1c77f70a86bf24d00087fcb975b39ff", + "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/94ff957a1366f5be94f3d3a9b89b50386649e3ae", + "reference": "94ff957a1366f5be94f3d3a9b89b50386649e3ae", "shasum": "" }, "require": { @@ -3250,7 +3252,7 @@ "phpspec/prophecy": "<1.9.0" }, "replace": { - "zendframework/zend-i18n": "self.version" + "zendframework/zend-i18n": "^2.10.1" }, "require-dev": { "laminas/laminas-cache": "^2.6.1", @@ -3299,7 +3301,7 @@ "i18n", "laminas" ], - "time": "2019-12-31T17:07:17+00:00" + "time": "2020-03-29T12:51:08+00:00" }, { "name": "laminas/laminas-log", @@ -3508,16 +3510,16 @@ }, { "name": "laminas/laminas-session", - "version": "2.9.2", + "version": "2.9.3", "source": { "type": "git", "url": "https://github.com/laminas/laminas-session.git", - "reference": "fdba34c1b257235dba2fff6ed4df1844390f85f6" + "reference": "519e8966146536cd97c1cc3d59a21b095fb814d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-session/zipball/fdba34c1b257235dba2fff6ed4df1844390f85f6", - "reference": "fdba34c1b257235dba2fff6ed4df1844390f85f6", + "url": "https://api.github.com/repos/laminas/laminas-session/zipball/519e8966146536cd97c1cc3d59a21b095fb814d7", + "reference": "519e8966146536cd97c1cc3d59a21b095fb814d7", "shasum": "" }, "require": { @@ -3527,7 +3529,7 @@ "php": "^5.6 || ^7.0" }, "replace": { - "zendframework/zend-session": "self.version" + "zendframework/zend-session": "^2.9.1" }, "require-dev": { "container-interop/container-interop": "^1.1", @@ -3575,7 +3577,7 @@ "laminas", "session" ], - "time": "2020-03-06T09:44:45+00:00" + "time": "2020-03-29T13:26:04+00:00" }, { "name": "laminas/laminas-text", @@ -3781,24 +3783,21 @@ }, { "name": "phpdocumentor/reflection-common", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a" + "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a", - "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b", + "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b", "shasum": "" }, "require": { "php": ">=7.1" }, - "require-dev": { - "phpunit/phpunit": "~6" - }, "type": "library", "extra": { "branch-alias": { @@ -3829,7 +3828,7 @@ "reflection", "static analysis" ], - "time": "2018-08-07T13:53:10+00:00" + "time": "2020-04-27T09:25:28+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -3995,16 +3994,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "0.4.3", + "version": "0.4.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "928179efc5368145a8b03cb20d58cb3f3136afae" + "reference": "d8d9d4645379e677466d407034436bb155b11c65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/928179efc5368145a8b03cb20d58cb3f3136afae", - "reference": "928179efc5368145a8b03cb20d58cb3f3136afae", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/d8d9d4645379e677466d407034436bb155b11c65", + "reference": "d8d9d4645379e677466d407034436bb155b11c65", "shasum": "" }, "require": { @@ -4016,7 +4015,7 @@ "jakub-onderka/php-parallel-lint": "^0.9.2", "phing/phing": "^2.16.0", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12", + "phpstan/phpstan": "^0.12.19", "phpstan/phpstan-strict-rules": "^0.12", "phpunit/phpunit": "^6.3", "slevomat/coding-standard": "^4.7.2", @@ -4040,7 +4039,7 @@ "MIT" ], "description": "PHPDoc parser with support for nullable, intersection and generic types", - "time": "2020-01-25T20:42:48+00:00" + "time": "2020-04-13T16:28:46+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4296,16 +4295,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.5.2", + "version": "8.5.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "018b6ac3c8ab20916db85fa91bf6465acb64d1e0" + "reference": "8474e22d7d642f665084ba5ec780626cbd1efd23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/018b6ac3c8ab20916db85fa91bf6465acb64d1e0", - "reference": "018b6ac3c8ab20916db85fa91bf6465acb64d1e0", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8474e22d7d642f665084ba5ec780626cbd1efd23", + "reference": "8474e22d7d642f665084ba5ec780626cbd1efd23", "shasum": "" }, "require": { @@ -4375,20 +4374,20 @@ "testing", "xunit" ], - "time": "2020-01-08T08:49:49+00:00" + "time": "2020-04-23T04:39:42+00:00" }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -4422,7 +4421,7 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -5041,33 +5040,39 @@ }, { "name": "slevomat/coding-standard", - "version": "6.1.5", + "version": "6.3.3", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "d767b5e302ff096327466c97fec3cb57f6d16086" + "reference": "b905a82255749de847fd4de607c7a4c8163f058d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/d767b5e302ff096327466c97fec3cb57f6d16086", - "reference": "d767b5e302ff096327466c97fec3cb57f6d16086", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/b905a82255749de847fd4de607c7a4c8163f058d", + "reference": "b905a82255749de847fd4de607c7a4c8163f058d", "shasum": "" }, "require": { "php": "^7.1", - "phpstan/phpdoc-parser": "0.3.5 - 0.4.3", - "squizlabs/php_codesniffer": "^3.5.4" + "phpstan/phpdoc-parser": "0.4.0 - 0.4.4", + "squizlabs/php_codesniffer": "^3.5.5" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "0.6.2", - "grogy/php-parallel-lint": "1.1.0", "phing/phing": "2.16.3", - "phpstan/phpstan": "0.11.19|0.12.9", - "phpstan/phpstan-phpunit": "0.11.2|0.12.6", - "phpstan/phpstan-strict-rules": "0.11.1|0.12.2", - "phpunit/phpunit": "7.5.18|8.5.2" + "php-parallel-lint/php-parallel-lint": "1.2.0", + "phpstan/phpstan": "0.12.19", + "phpstan/phpstan-deprecation-rules": "0.12.2", + "phpstan/phpstan-phpunit": "0.12.8", + "phpstan/phpstan-strict-rules": "0.12.2", + "phpunit/phpunit": "7.5.20|8.5.2|9.1.2" }, "type": "phpcodesniffer-standard", + "extra": { + "branch-alias": { + "dev-master": "6.x-dev" + } + }, "autoload": { "psr-4": { "SlevomatCodingStandard\\": "SlevomatCodingStandard" @@ -5078,20 +5083,20 @@ "MIT" ], "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", - "time": "2020-02-05T21:17:34+00:00" + "time": "2020-04-28T07:15:08+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.4", + "version": "3.5.5", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "dceec07328401de6211037abbb18bda423677e26" + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dceec07328401de6211037abbb18bda423677e26", - "reference": "dceec07328401de6211037abbb18bda423677e26", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6", + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6", "shasum": "" }, "require": { @@ -5129,20 +5134,20 @@ "phpcs", "standards" ], - "time": "2020-01-30T22:20:29+00:00" + "time": "2020-04-17T01:09:41+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.14.0", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38" + "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", - "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14", + "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14", "shasum": "" }, "require": { @@ -5154,7 +5159,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5187,7 +5192,7 @@ "polyfill", "portable" ], - "time": "2020-01-13T11:15:53+00:00" + "time": "2020-02-27T09:26:54+00:00" }, { "name": "theseer/tokenizer", @@ -5231,16 +5236,16 @@ }, { "name": "webmozart/assert", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "aed98a490f9a8f78468232db345ab9cf606cf598" + "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598", - "reference": "aed98a490f9a8f78468232db345ab9cf606cf598", + "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6", + "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6", "shasum": "" }, "require": { @@ -5248,7 +5253,7 @@ "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "vimeo/psalm": "<3.6.0" + "vimeo/psalm": "<3.9.1" }, "require-dev": { "phpunit/phpunit": "^4.8.36 || ^7.5.13" @@ -5275,7 +5280,7 @@ "check", "validate" ], - "time": "2020-02-14T12:15:55+00:00" + "time": "2020-04-18T12:12:48+00:00" } ], "aliases": [], From 1f0381df5acc1c6a567f98c6439da3df2fe59173 Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Fri, 1 May 2020 08:06:56 -0600 Subject: [PATCH 9/9] Added space to bottom of README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ea81b6a..9ac155d 100644 --- a/README.md +++ b/README.md @@ -117,3 +117,4 @@ Run phpcs as ``` docker-compose run --rm php composer cs-check src test config ``` +