diff --git a/CHANGELOG.md b/CHANGELOG.md index b5325a7..f1026d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [v2.2.0] - 2024-08-29 +### Fixed +- `slick/webstack` changes the configuration interface to use `ConfigurationInterface`, resulting in + an initialization error. + ## [v2.1.3] - 2024-08-13 ### Added - Event handling when (en|dis)abling the module. @@ -39,7 +44,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Completely remake for Slick v1.2.0. - First released stand alone ORM package for Slick framework. -[Unreleased]: https://github.com/slickframework/orm/compare/v2.1.0...HEAD +[Unreleased]: https://github.com/slickframework/orm/compare/v2.2.0...HEAD +[v2.2.0]: https://github.com/slickframework/orm/compare/v2.1.0...v2.2.0 [v2.1.0]: https://github.com/slickframework/orm/compare/v2.0.3...v2.1.0 [v2.0.3]: https://github.com/slickframework/orm/compare/v2.0.2...v2.0.3 [v2.0.2]: https://github.com/slickframework/orm/compare/v2.0.0...v2.0.2 diff --git a/LICENSE b/LICENSE.md similarity index 92% rename from LICENSE rename to LICENSE.md index 5278e71..b0b6e92 100644 --- a/LICENSE +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2024 The Slick Team +Copyright (c) 2014-present The Slick Team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/composer.json b/composer.json index c44c333..a6f8e9d 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Slick ORM is a module that provides ORM support to a Slick application using doctrine/orm.", "minimum-stability": "dev", "license": "MIT", - "version": "v2.1.0", + "version": "v2.2.0", "keywords": [ "slick", "ORM", @@ -47,7 +47,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.1-dev", + "dev-master": "2.2-dev", "dev-develop": "2.x-dev" } }, diff --git a/composer.lock b/composer.lock index 8ffa0ac..82d91f2 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": "6c8f4c2d43a33bb6db98954afce58ca0", + "content-hash": "d594a86a5cb84170b96c1f717ba43d15", "packages": [ { "name": "doctrine/collections", @@ -12,17 +12,18 @@ "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "9a0a968301a984552e7c6accf66a382bb0bc21ff" + "reference": "1a882ec96b02eecff790042e2fe6790eb62b57c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/9a0a968301a984552e7c6accf66a382bb0bc21ff", - "reference": "9a0a968301a984552e7c6accf66a382bb0bc21ff", + "url": "https://api.github.com/repos/doctrine/collections/zipball/1a882ec96b02eecff790042e2fe6790eb62b57c0", + "reference": "1a882ec96b02eecff790042e2fe6790eb62b57c0", "shasum": "" }, "require": { "doctrine/deprecations": "^1", - "php": "^8.1" + "php": "^8.1", + "symfony/polyfill-php84": "^1.30" }, "require-dev": { "doctrine/coding-standard": "^12", @@ -90,20 +91,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:18:05+00:00" + "time": "2024-08-28T19:44:12+00:00" }, { "name": "doctrine/dbal", - "version": "4.1.x-dev", + "version": "4.2.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "267bbffca06a09c0ca3ec3f41039874b666ee6c9" + "reference": "d47b6b1f6601cddb2395790ff2a0ce293b59ff50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/267bbffca06a09c0ca3ec3f41039874b666ee6c9", - "reference": "267bbffca06a09c0ca3ec3f41039874b666ee6c9", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/d47b6b1f6601cddb2395790ff2a0ce293b59ff50", + "reference": "d47b6b1f6601cddb2395790ff2a0ce293b59ff50", "shasum": "" }, "require": { @@ -116,16 +117,16 @@ "doctrine/coding-standard": "12.0.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.2", - "phpstan/phpstan": "1.11.7", + "phpstan/phpstan": "1.12.0", "phpstan/phpstan-phpunit": "1.4.0", "phpstan/phpstan-strict-rules": "^1.6", - "phpunit/phpunit": "10.5.28", + "phpunit/phpunit": "10.5.30", "psalm/plugin-phpunit": "0.19.0", "slevomat/coding-standard": "8.13.1", "squizlabs/php_codesniffer": "3.10.2", "symfony/cache": "^6.3.8|^7.0", "symfony/console": "^5.4|^6.3|^7.0", - "vimeo/psalm": "5.24.0" + "vimeo/psalm": "5.25.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -182,7 +183,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/4.1.x" + "source": "https://github.com/doctrine/dbal/tree/4.2.x" }, "funding": [ { @@ -198,7 +199,7 @@ "type": "tidelift" } ], - "time": "2024-08-11T15:51:29+00:00" + "time": "2024-08-29T09:05:39+00:00" }, { "name": "doctrine/deprecations", @@ -585,12 +586,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "846e76645d34f98c9f716369a1643a42e7453519" + "reference": "bcff5ce72e85c23e6f129e9c478aaae37c16c5c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/846e76645d34f98c9f716369a1643a42e7453519", - "reference": "846e76645d34f98c9f716369a1643a42e7453519", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/bcff5ce72e85c23e6f129e9c478aaae37c16c5c0", + "reference": "bcff5ce72e85c23e6f129e9c478aaae37c16c5c0", "shasum": "" }, "require": { @@ -613,6 +614,7 @@ "doctrine/persistence": "^2 || ^3", "doctrine/sql-formatter": "^1.0", "ext-pdo_sqlite": "*", + "fig/log-test": "^1", "phpstan/phpstan": "^1.10", "phpstan/phpstan-deprecation-rules": "^1.1", "phpstan/phpstan-phpunit": "^1.3", @@ -679,7 +681,7 @@ "type": "tidelift" } ], - "time": "2024-06-26T14:16:28+00:00" + "time": "2024-08-28T16:07:12+00:00" }, { "name": "doctrine/orm", @@ -687,12 +689,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "56cd688c4a74ba5dfa732bfdc5baa159ccb92328" + "reference": "c6b2d897489d535536de435bdef48f2783366ffb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/56cd688c4a74ba5dfa732bfdc5baa159ccb92328", - "reference": "56cd688c4a74ba5dfa732bfdc5baa159ccb92328", + "url": "https://api.github.com/repos/doctrine/orm/zipball/c6b2d897489d535536de435bdef48f2783366ffb", + "reference": "c6b2d897489d535536de435bdef48f2783366ffb", "shasum": "" }, "require": { @@ -767,7 +769,7 @@ "issues": "https://github.com/doctrine/orm/issues", "source": "https://github.com/doctrine/orm/tree/3.3.x" }, - "time": "2024-08-01T23:01:23+00:00" + "time": "2024-08-24T05:29:36+00:00" }, { "name": "doctrine/persistence", @@ -1286,12 +1288,12 @@ "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "79dff0b268932c640297f5208d6298f71855c03e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", + "reference": "79dff0b268932c640297f5208d6298f71855c03e", "shasum": "" }, "require": { @@ -1327,9 +1329,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.1" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2024-08-21T13:31:24+00:00" }, { "name": "slick/di", @@ -1337,12 +1339,12 @@ "source": { "type": "git", "url": "https://github.com/slickframework/di.git", - "reference": "0917967c1166fccc081f338572c9347dc3ab2c4f" + "reference": "6aa3b868168c4ad4845a7d3e4618013245e9caba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slickframework/di/zipball/0917967c1166fccc081f338572c9347dc3ab2c4f", - "reference": "0917967c1166fccc081f338572c9347dc3ab2c4f", + "url": "https://api.github.com/repos/slickframework/di/zipball/6aa3b868168c4ad4845a7d3e4618013245e9caba", + "reference": "6aa3b868168c4ad4845a7d3e4618013245e9caba", "shasum": "" }, "require": { @@ -1361,7 +1363,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev", + "dev-master": "2.10-dev", "dev-develop": "2.x-dev" } }, @@ -1393,7 +1395,7 @@ "issues": "https://github.com/slickframework/di/issues", "source": "https://github.com/slickframework/di/tree/develop" }, - "time": "2024-06-24T12:14:04+00:00" + "time": "2024-08-15T21:29:15+00:00" }, { "name": "slick/fswatch", @@ -1516,12 +1518,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "3c43d7ec3eb45e0eac993e86bee2905bfee5246b" + "reference": "cc2dd55c49e04b10cec4aa6e47e099a2d1656845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/3c43d7ec3eb45e0eac993e86bee2905bfee5246b", - "reference": "3c43d7ec3eb45e0eac993e86bee2905bfee5246b", + "url": "https://api.github.com/repos/symfony/console/zipball/cc2dd55c49e04b10cec4aa6e47e099a2d1656845", + "reference": "cc2dd55c49e04b10cec4aa6e47e099a2d1656845", "shasum": "" }, "require": { @@ -1601,7 +1603,7 @@ "type": "tidelift" } ], - "time": "2024-08-13T14:29:53+00:00" + "time": "2024-08-15T22:49:18+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2074,6 +2076,83 @@ ], "time": "2024-05-31T15:07:36+00:00" }, + { + "name": "symfony/polyfill-php84", + "version": "1.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php84.git", + "reference": "3e6c61adaa857e2de985983347c583b6ccc2d30e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/3e6c61adaa857e2de985983347c583b6ccc2d30e", + "reference": "3e6c61adaa857e2de985983347c583b6ccc2d30e", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "default-branch": true, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php84\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php84/tree/1.x" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-06-20T08:18:00+00:00" + }, { "name": "symfony/service-contracts", "version": "dev-main", @@ -2476,22 +2555,22 @@ "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90" + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/ea4ab6f9580a4fd221e0418f2c357cdd39102a90", - "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90", + "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4", "shasum": "" }, "require": { "php": "^7.4 || ^8.0" }, "conflict": { - "phpstan/phpstan": "<1.11.8" + "phpstan/phpstan": "<1.11.10" }, "require-dev": { - "phpstan/phpstan": "^1.11.8", + "phpstan/phpstan": "^1.11.10", "phpstan/phpstan-strict-rules": "^1.1", "phpunit/phpunit": "^8 || ^9" }, @@ -2532,7 +2611,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.2.0" + "source": "https://github.com/composer/pcre/tree/3.3.1" }, "funding": [ { @@ -2548,7 +2627,7 @@ "type": "tidelift" } ], - "time": "2024-07-25T09:36:02+00:00" + "time": "2024-08-27T18:44:43+00:00" }, { "name": "composer/xdebug-handler", @@ -2622,12 +2701,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8" + "reference": "3327c29d3799da2eb321032afc73d01b6aa51cb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8", - "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/3327c29d3799da2eb321032afc73d01b6aa51cb8", + "reference": "3327c29d3799da2eb321032afc73d01b6aa51cb8", "shasum": "" }, "require": { @@ -2704,7 +2783,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.7.0" + "source": "https://github.com/Seldaek/monolog/tree/main" }, "funding": [ { @@ -2716,7 +2795,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T09:40:51+00:00" + "time": "2024-08-27T07:51:08+00:00" }, { "name": "myclabs/deep-copy", @@ -3079,12 +3158,12 @@ "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "aa53f8d4374d1f5bd3fc598548d6272cb5d9bf39" + "reference": "60741fe3871f40e44ca10a28ce85d08b7ed841cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/aa53f8d4374d1f5bd3fc598548d6272cb5d9bf39", - "reference": "aa53f8d4374d1f5bd3fc598548d6272cb5d9bf39", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/60741fe3871f40e44ca10a28ce85d08b7ed841cd", + "reference": "60741fe3871f40e44ca10a28ce85d08b7ed841cd", "shasum": "" }, "require": { @@ -3136,7 +3215,7 @@ "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.x" }, - "time": "2024-05-21T06:14:15+00:00" + "time": "2024-08-14T20:00:37+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -3287,12 +3366,12 @@ "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "f9e07be0992e7bf1cad210829055b99318df142f" + "reference": "e3810e5e638cd91f6f6d82059c60ad85f2b3ffb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f9e07be0992e7bf1cad210829055b99318df142f", - "reference": "f9e07be0992e7bf1cad210829055b99318df142f", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e3810e5e638cd91f6f6d82059c60ad85f2b3ffb1", + "reference": "e3810e5e638cd91f6f6d82059c60ad85f2b3ffb1", "shasum": "" }, "require": { @@ -3303,6 +3382,7 @@ "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^3.40", "phpspec/phpspec": "^6.0 || ^7.0", "phpstan/phpstan": "^1.9", "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" @@ -3349,7 +3429,7 @@ "issues": "https://github.com/phpspec/prophecy/issues", "source": "https://github.com/phpspec/prophecy/tree/master" }, - "time": "2024-03-29T09:25:04+00:00" + "time": "2024-08-27T07:52:54+00:00" }, { "name": "phpspec/prophecy-phpunit", @@ -3409,16 +3489,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.29.1", + "version": "1.30.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4" + "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4", - "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/5ceb0e384997db59f38774bf79c2a6134252c08f", + "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f", "shasum": "" }, "require": { @@ -3450,9 +3530,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.0" }, - "time": "2024-05-31T08:52:43+00:00" + "time": "2024-08-29T09:54:52+00:00" }, { "name": "phpstan/phpstan", @@ -3460,12 +3540,12 @@ "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "a66e75d9c1880e6cc7ebc39900683cf66b09263b" + "reference": "49bef4446db647c244161f03403b9abb6e9a3041" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a66e75d9c1880e6cc7ebc39900683cf66b09263b", - "reference": "a66e75d9c1880e6cc7ebc39900683cf66b09263b", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/49bef4446db647c244161f03403b9abb6e9a3041", + "reference": "49bef4446db647c244161f03403b9abb6e9a3041", "shasum": "" }, "require": { @@ -3508,13 +3588,9 @@ { "url": "https://github.com/phpstan", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", - "type": "tidelift" } ], - "time": "2023-12-20T14:54:02+00:00" + "time": "2024-08-27T11:47:48+00:00" }, { "name": "phpunit/php-code-coverage", @@ -3522,28 +3598,28 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "5f00216aabf7c9fb50d8070694905de0b1334368" + "reference": "ebdffc9e09585dafa71b9bffcdb0a229d4704c45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5f00216aabf7c9fb50d8070694905de0b1334368", - "reference": "5f00216aabf7c9fb50d8070694905de0b1334368", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ebdffc9e09585dafa71b9bffcdb0a229d4704c45", + "reference": "ebdffc9e09585dafa71b9bffcdb0a229d4704c45", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^5.0", + "nikic/php-parser": "^5.1.0", "php": ">=8.2", - "phpunit/php-file-iterator": "^5.0", - "phpunit/php-text-template": "^4.0", - "sebastian/code-unit-reverse-lookup": "^4.0", - "sebastian/complexity": "^4.0", - "sebastian/environment": "^7.0", - "sebastian/lines-of-code": "^3.0", - "sebastian/version": "^5.0", - "theseer/tokenizer": "^1.2.0" + "phpunit/php-file-iterator": "^5.0.1", + "phpunit/php-text-template": "^4.0.1", + "sebastian/code-unit-reverse-lookup": "^4.0.1", + "sebastian/complexity": "^4.0.1", + "sebastian/environment": "^7.2.0", + "sebastian/lines-of-code": "^3.0.1", + "sebastian/version": "^5.0.1", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { "phpunit/phpunit": "^11.0" @@ -3585,7 +3661,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/main" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.6" }, "funding": [ { @@ -3593,20 +3669,20 @@ "type": "github" } ], - "time": "2024-08-13T09:32:09+00:00" + "time": "2024-08-22T04:37:56+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "dev-main", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "631d53598cec6fc96ff3a1696b1d487d76cc4db2" + "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/631d53598cec6fc96ff3a1696b1d487d76cc4db2", - "reference": "631d53598cec6fc96ff3a1696b1d487d76cc4db2", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/118cfaaa8bc5aef3287bf315b6060b1174754af6", + "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6", "shasum": "" }, "require": { @@ -3615,7 +3691,6 @@ "require-dev": { "phpunit/phpunit": "^11.0" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3647,7 +3722,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/main" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.0" }, "funding": [ { @@ -3655,7 +3730,7 @@ "type": "github" } ], - "time": "2024-08-13T09:33:00+00:00" + "time": "2024-08-27T05:02:59+00:00" }, { "name": "phpunit/php-invoker", @@ -3850,12 +3925,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "70498a027b53fab5da0d15d3c291bdf51c1b1297" + "reference": "11bbe1268a8c3d3c8dda3a1bb4ae44cd61d08f8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/70498a027b53fab5da0d15d3c291bdf51c1b1297", - "reference": "70498a027b53fab5da0d15d3c291bdf51c1b1297", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/11bbe1268a8c3d3c8dda3a1bb4ae44cd61d08f8b", + "reference": "11bbe1268a8c3d3c8dda3a1bb4ae44cd61d08f8b", "shasum": "" }, "require": { @@ -3869,8 +3944,8 @@ "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.2", - "phpunit/php-code-coverage": "^11.0.5", - "phpunit/php-file-iterator": "^5.0.1", + "phpunit/php-code-coverage": "^11.0.6", + "phpunit/php-file-iterator": "^5.1.0", "phpunit/php-invoker": "^5.0.1", "phpunit/php-text-template": "^4.0.1", "phpunit/php-timer": "^7.0.1", @@ -3943,7 +4018,7 @@ "type": "tidelift" } ], - "time": "2024-08-13T09:38:56+00:00" + "time": "2024-08-29T09:26:22+00:00" }, { "name": "psr/http-client", @@ -4314,12 +4389,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "c70013aa038f430abfc61232baa2079385cea7df" + "reference": "6af04a161091265daf4791511c37158c837be274" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c70013aa038f430abfc61232baa2079385cea7df", - "reference": "c70013aa038f430abfc61232baa2079385cea7df", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/6af04a161091265daf4791511c37158c837be274", + "reference": "6af04a161091265daf4791511c37158c837be274", "shasum": "" }, "require": { @@ -4374,7 +4449,7 @@ "type": "github" } ], - "time": "2024-08-13T08:53:16+00:00" + "time": "2024-08-21T07:25:16+00:00" }, { "name": "sebastian/environment", @@ -5074,12 +5149,12 @@ "source": { "type": "git", "url": "https://github.com/slickframework/web-stack.git", - "reference": "dd4b91aa92aa73c50d55b64ac372b425c0d02fc0" + "reference": "e4ffd01c0bbb14983e9d52059ac1986fa23dd5b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slickframework/web-stack/zipball/dd4b91aa92aa73c50d55b64ac372b425c0d02fc0", - "reference": "dd4b91aa92aa73c50d55b64ac372b425c0d02fc0", + "url": "https://api.github.com/repos/slickframework/web-stack/zipball/e4ffd01c0bbb14983e9d52059ac1986fa23dd5b5", + "reference": "e4ffd01c0bbb14983e9d52059ac1986fa23dd5b5", "shasum": "" }, "require": { @@ -5145,7 +5220,7 @@ "issues": "https://github.com/slickframework/web-stack/issues", "source": "https://github.com/slickframework/web-stack/tree/V2" }, - "time": "2024-08-07T01:15:52+00:00" + "time": "2024-08-15T20:49:42+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -5153,12 +5228,12 @@ "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "ad7fbda5f2fa0399626829905e881d9675dc3c0f" + "reference": "7d9f2113e5ea4858c9149559b0bc5d8678631fa0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ad7fbda5f2fa0399626829905e881d9675dc3c0f", - "reference": "ad7fbda5f2fa0399626829905e881d9675dc3c0f", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/7d9f2113e5ea4858c9149559b0bc5d8678631fa0", + "reference": "7d9f2113e5ea4858c9149559b0bc5d8678631fa0", "shasum": "" }, "require": { @@ -5225,7 +5300,7 @@ "type": "open_collective" } ], - "time": "2024-08-09T17:00:47+00:00" + "time": "2024-08-17T17:44:04+00:00" }, { "name": "symfony/cache", @@ -5483,12 +5558,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "6d3814092f3ff2f51bd157c246cc931d9cc14077" + "reference": "9f2433d629f56c3417ad474d553d5d3b0682f508" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6d3814092f3ff2f51bd157c246cc931d9cc14077", - "reference": "6d3814092f3ff2f51bd157c246cc931d9cc14077", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9f2433d629f56c3417ad474d553d5d3b0682f508", + "reference": "9f2433d629f56c3417ad474d553d5d3b0682f508", "shasum": "" }, "require": { @@ -5555,7 +5630,7 @@ "type": "tidelift" } ], - "time": "2024-08-13T10:08:05+00:00" + "time": "2024-08-29T08:18:49+00:00" }, { "name": "symfony/filesystem", @@ -5629,12 +5704,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "10517c1d0b8bd50f7bbfa38345179aaae1dd3b5e" + "reference": "2af9f7bf51cf1d2a9676c4b952312ab9721c0ccd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/10517c1d0b8bd50f7bbfa38345179aaae1dd3b5e", - "reference": "10517c1d0b8bd50f7bbfa38345179aaae1dd3b5e", + "url": "https://api.github.com/repos/symfony/routing/zipball/2af9f7bf51cf1d2a9676c4b952312ab9721c0ccd", + "reference": "2af9f7bf51cf1d2a9676c4b952312ab9721c0ccd", "shasum": "" }, "require": { @@ -5702,7 +5777,7 @@ "type": "tidelift" } ], - "time": "2024-08-12T08:31:17+00:00" + "time": "2024-08-29T08:18:49+00:00" }, { "name": "theseer/tokenizer", diff --git a/config/services.php b/config/services.php index c77933e..b30863a 100644 --- a/config/services.php +++ b/config/services.php @@ -12,17 +12,17 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Types\Type; use Doctrine\ORM\EntityManagerInterface; +use Slick\Configuration\ConfigurationInterface; use Slick\Di\ContainerInterface; use Slick\Orm\Infrastructure\Persistence\EntityManagerCollection; use Slick\Orm\Infrastructure\Persistence\EntityManagerFactory; use Slick\Orm\Infrastructure\Persistence\ManagerSettings; -use Slick\WebStack\Infrastructure\ApplicationSettingsInterface; return [ EntityManagerFactory::class => fn (ContainerInterface $container) => new EntityManagerFactory($container), EntityManagerCollection::class => function (ContainerInterface $container) { $entityManagers = new EntityManagerCollection(); - $settings = $container->get(ApplicationSettingsInterface::class)->get('databases', []); + $settings = $container->get(ConfigurationInterface::class)->get('databases', []); $factory = $container->get(EntityManagerFactory::class); foreach ($settings as $name => $values) { /** @var EntityManagerInterface $entityManager */ @@ -31,7 +31,7 @@ $container->register("$name.entity.manager", $entityManager); $container->register("$name.db.connection", $entityManager->getConnection()); } - $types = $container->get(ApplicationSettingsInterface::class)->get('types', []); + $types = $container->get(ConfigurationInterface::class)->get('types', []); foreach ($types as $name => $className) { Type::addType($name, $className); } diff --git a/tests/OrmModuleTest.php b/tests/OrmModuleTest.php index af0811a..32454e5 100644 --- a/tests/OrmModuleTest.php +++ b/tests/OrmModuleTest.php @@ -16,13 +16,12 @@ use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Prophecy\PhpUnit\ProphecyTrait; -use Psr\Http\Server\MiddlewareInterface; +use Slick\Configuration\ConfigurationInterface; use Slick\Di\Container; use Slick\Di\ContainerInterface; use Slick\Orm\Infrastructure\Persistence\EntityManagerCollection; use Slick\Orm\Infrastructure\Persistence\EntityManagerFactory; use Slick\Orm\OrmModule; -use Slick\WebStack\Infrastructure\ApplicationSettingsInterface; use Slick\WebStack\Infrastructure\DependencyContainerFactory; use Symfony\Component\Console\Application; @@ -69,11 +68,11 @@ public function itConfiguresConsoleApp(): void #[Test] public function createEntityManagers(): void { - $settings = $this->prophesize(ApplicationSettingsInterface::class); + $settings = $this->prophesize(ConfigurationInterface::class); $settings->get('databases', [])->willReturn(['default' => []]); $settings->get('types', [])->willReturn(['Email' => DoctrineEmail::class]); $container = $this->prophesize(Container::class); - $container->get(ApplicationSettingsInterface::class)->willReturn($settings->reveal()); + $container->get(ConfigurationInterface::class)->willReturn($settings->reveal()); $container->get(EntityManagerFactory::class)->willReturn(new EntityManagerFactory($container->reveal())); $container->register( "default.entity.manager",