Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumped version of the components and dropped old versions. #29

Open
wants to merge 15 commits into
base: 2.5.x
Choose a base branch
from
Open

Bumped version of the components and dropped old versions. #29

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f89adfb
#13 Updated base class.
tasselchof Oct 4, 2021
fd08a75
Improvements to work with API-Skeletons/doctrine-orm-hydration-module.
tasselchof Oct 4, 2021
0e5bd1c
Fixed component version.
tasselchof Oct 4, 2021
df6c8c9
Merge branch 'laminas-api-tools:2.5.x' into 2.5.x
tasselchof Mar 9, 2022
514f121
Updated a version of the doctrine module.
tasselchof Mar 9, 2022
63c83ec
Merge remote-tracking branch 'origin/2.5.x' into 2.5.x
Mar 9, 2022
30452bb
#28 Updated a version of the doctrine module.
tasselchof Mar 9, 2022
831b12d
#28 Updated a versions in composer.json and added return types.
tasselchof Mar 15, 2022
37a292a
#28 Removed ODM support, fixed dependencies and PHPUnit tests.
tasselchof Apr 20, 2022
bfadae4
#28 Fixed composer.json file.
tasselchof Apr 20, 2022
41484ce
#29 Fixed cs-fix and psalm issues.
tasselchof May 14, 2022
96367b5
#29 Fixed legacy aliases.
tasselchof May 14, 2022
5760ca9
Apply review changes
javabudd Jul 29, 2022
001b8d0
Merge pull request #1 from javabudd/2.5.x
tasselchof Jul 30, 2022
5381ab8
Added PHP versions.
tasselchof Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
"forum": "https://discourse.laminas.dev"
},
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"extra": {
"laminas": {
Expand All @@ -29,30 +32,30 @@
}
},
"require": {
"php": "^7.3 || ~8.0.0",
"php": "^7.4 || ~8.0.0",
"ext-json": "*",
"api-skeletons/doctrine-orm-hydration-module": "^1.0",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should probably be replaced with doctrine/doctrine-laminas-hydrator

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should probably be replaced with doctrine/doctrine-laminas-hydrator

Probably, but it might be not so easy.

"laminas-api-tools/api-tools": "^1.3",
"laminas-api-tools/api-tools-rest": "^1.3.2",
"laminas/laminas-hydrator": "^2.4.2 || ^3.0",
"laminas/laminas-hydrator": "^4.0",
"laminas/laminas-servicemanager": "^3.11.2",
"laminas/laminas-stdlib": "^3.3",
"laminas/laminas-view": "^2.11.3",
"laminas/laminas-zendframework-bridge": "^1.0",
"phpro/zf-doctrine-hydration-module": "^2.0.1 || ^3.0 || ^4.1"
"laminas/laminas-zendframework-bridge": "^1.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed anymore? Are any of the dependencies using ZF deps?

},
"require-dev": {
"doctrine/doctrine-module": "^1.2.0 || ^2.1.7",
"doctrine/doctrine-mongo-odm-module": "^0.11.0 || ^1.0.0 || ^2.0.0",
"doctrine/doctrine-orm-module": "^1.1.8 || ^2.1.3",
"doctrine/mongodb-odm": "^1.1.0",
"doctrine/dbal": "^2.10",
"doctrine/doctrine-module": "^5.1",
"doctrine/doctrine-orm-module": "^5.1",
"laminas-api-tools/api-tools-admin": "^1.5.7",
"laminas-api-tools/api-tools-hal": "^1.6.1",
"laminas/laminas-coding-standard": "~2.3.0",
"laminas/laminas-form": "^2.9.2",
"laminas/laminas-form": "^3.1.1",
"laminas/laminas-i18n": "^2.7.3",
"laminas/laminas-log": "^2.9.1",
"laminas/laminas-mvc": "^2.7.13 || ^3.0.2",
"laminas/laminas-serializer": "^2.8.0",
"laminas/laminas-test": "^2.6.1 || ^3.0.1",
"mongodb/mongodb": "^1.1.0",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.3",
"psalm/plugin-phpunit": "^0.16.1",
Expand All @@ -61,7 +64,9 @@
},
"conflict": {
"doctrine/dbal": "<2.12.0",
"doctrine/orm": "<2.6.3"
"doctrine/orm": "<2.6.3",
"doctrine/doctrine-module": "<4.0",
"doctrine/doctrine-orm-module": "<4.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we run maglnet/composer-require-checker on the codebase, to discover if any of these conflicts are part of symbols that we use?

If they are, we should just have them in require instead.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

php composer-require-checker.phar check composer.json
ComposerRequireChecker 4.0.0@baa11a4e9e5072117e3d180ef16c07036cafa4a2
The following 51 unknown symbols were found:
+-----------------------------------------------------------+--------------------+
| Unknown Symbol                                            | Guessed Dependency |
+-----------------------------------------------------------+--------------------+
| DoctrineModule\Persistence\ObjectManagerAwareInterface    |                    |
| DoctrineModule\Validator\NoObjectExists                   |                    |
| DoctrineModule\Validator\ObjectExists                     |                    |
| Doctrine\Common\Collections\ArrayCollection               |                    |
| Doctrine\Laminas\Hydrator\DoctrineObject                  |                    |
| Doctrine\ORM\EntityManager                                |                    |
| Doctrine\ORM\EntityManagerInterface                       |                    |
| Doctrine\ORM\NoResultException                            |                    |
| Doctrine\ORM\QueryBuilder                                 |                    |
| Doctrine\ORM\Tools\Pagination\Paginator                   |                    |
| Doctrine\Persistence\ObjectManager                        |                    |
| interop\container\containerinterface                      |                    |
| Laminas\ApiTools\Admin\Exception\InvalidArgumentException |                    |
| Laminas\ApiTools\Admin\Exception\RuntimeException         |                    |
| Laminas\ApiTools\Admin\Model\AbstractAutodiscoveryModel   |                    |
| Laminas\ApiTools\Admin\Model\DocumentationModel           |                    |
| Laminas\ApiTools\Admin\Model\InputFilterModel             |                    |
| Laminas\ApiTools\Admin\Model\ModuleEntity                 |                    |
| Laminas\ApiTools\Admin\Model\ModuleModel                  |                    |
| Laminas\ApiTools\Admin\Model\ModulePathSpec               |                    |
| Laminas\ApiTools\Admin\Model\NewRestServiceEntity         |                    |
| Laminas\ApiTools\Admin\Model\RestServiceEntity            |                    |
| Laminas\ApiTools\Admin\Model\RestServiceModelFactory      |                    |
| Laminas\ApiTools\Admin\Model\RestServiceResource          |                    |
| Laminas\ApiTools\Admin\Model\RpcServiceEntity             |                    |
| Laminas\ApiTools\Admin\Model\RpcServiceModelFactory       |                    |
| Laminas\ApiTools\Admin\Model\RpcServiceResource           |                    |
| Laminas\ApiTools\Admin\Utility                            |                    |
| Laminas\ApiTools\ApiProblem\ApiProblem                    |                    |
| Laminas\ApiTools\Configuration\ConfigResource             |                    |
| Laminas\ApiTools\Configuration\ConfigResourceFactory      |                    |
| Laminas\ApiTools\ContentNegotiation\ViewModel             |                    |
| Laminas\ApiTools\Doctrine\Admin\Model\InvokableFactory    |                    |
| Laminas\EventManager\Event                                |                    |
| Laminas\EventManager\EventManager                         |                    |
| Laminas\EventManager\EventManagerAwareInterface           |                    |
| Laminas\EventManager\EventManagerInterface                |                    |
| Laminas\EventManager\ListenerAggregateInterface           |                    |
| Laminas\EventManager\SharedEventManager                   |                    |
| Laminas\EventManager\SharedEventManagerInterface          |                    |
| Laminas\Filter\FilterChain                                |                    |
| Laminas\Filter\StringToLower                              |                    |
| Laminas\Filter\Word\CamelCaseToDash                       |                    |
| Laminas\InputFilter\CollectionInputFilter                 |                    |
| Laminas\InputFilter\InputFilterInterface                  |                    |
| Laminas\ModuleManager\ModuleManager                       |                    |
| Laminas\Mvc\Controller\AbstractActionController           |                    |
| Laminas\Mvc\Controller\ControllerManager                  |                    |
| Laminas\Mvc\ModuleRouteListener                           |                    |
| Laminas\Mvc\Service\AbstractPluginManagerFactory          |                    |
| Laminas\Paginator\Adapter\AdapterInterface                |                    |
+-----------------------------------------------------------+--------------------+

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is a lot of stuff @_@

I don't think we can add all these in this patch though...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can fix these here by just adding the require/ blocks in the code, but I'd be OK for us doing this in 3.1.x later

},
"suggest": {
"api-skeletons/zf-doctrine-hydrator": "Hydrator strategies for Doctrine in Laminas API Tools",
Expand Down
Loading