瀏覽代碼

upgrade to symfony 7.2

Olivier Massot 9 月之前
父節點
當前提交
f25c269e96

+ 30 - 30
composer.json

@@ -16,7 +16,7 @@
     "composer/package-versions-deprecated": "^1.11",
     "doctrine/dbal": "^3.9",
     "doctrine/doctrine-bundle": "2.13",
-    "doctrine/doctrine-migrations-bundle": "^3.0",
+    "doctrine/doctrine-migrations-bundle": "^3.4",
     "doctrine/orm": "^3.3",
     "dompdf/dompdf": "^3.1",
     "egulias/email-validator": "^4.0",
@@ -28,40 +28,40 @@
     "liip/imagine-bundle": "^2.13",
     "lorenzo/pinky": "^1.0",
     "myclabs/php-enum": "^1.8",
-    "nelmio/cors-bundle": "^2.1",
+    "nelmio/cors-bundle": "^2.5",
     "odolbeau/phone-number-bundle": "^4.1",
     "opentalent/phpdocx": "dev-master",
     "phpdocumentor/reflection-docblock": "^5.6",
     "phpstan/phpdoc-parser": "^1.16",
     "ramsey/uuid": "^4.2",
     "ramsey/uuid-doctrine": "^2.0",
-    "symfony/asset": "6.4.*",
-    "symfony/console": "6.4.*",
-    "symfony/doctrine-messenger": "6.4.*",
-    "symfony/dotenv": "6.4.*",
-    "symfony/error-handler": "6.4.*",
-    "symfony/expression-language": "6.4.*",
+    "symfony/asset": "7.2.*",
+    "symfony/console": "7.2.*",
+    "symfony/doctrine-messenger": "7.2.*",
+    "symfony/dotenv": "7.2.*",
+    "symfony/error-handler": "7.2.*",
+    "symfony/expression-language": "7.2.*",
     "symfony/flex": "^1.3.1",
-    "symfony/framework-bundle": "6.4.*",
-    "symfony/http-client": "6.4.*",
-    "symfony/intl": "6.4.*",
-    "symfony/lock": "6.4.*",
-    "symfony/mailer": "6.4.*",
+    "symfony/framework-bundle": "7.2.*",
+    "symfony/http-client": "7.2.*",
+    "symfony/intl": "7.2.*",
+    "symfony/lock": "7.2.*",
+    "symfony/mailer": "7.2.*",
     "symfony/mercure": "^0.6.1",
     "symfony/mercure-bundle": "^0.3.4",
-    "symfony/messenger": "6.4.*",
+    "symfony/messenger": "7.2.*",
     "symfony/monolog-bundle": "^3.7",
     "symfony/polyfill-intl-icu": "^1.21",
     "symfony/polyfill-intl-messageformatter": "^1.24",
-    "symfony/property-access": "6.4.*",
-    "symfony/property-info": "6.4.*",
-    "symfony/security-bundle": "6.4.*",
-    "symfony/serializer": "6.4.*",
-    "symfony/translation": "6.4.*",
-    "symfony/twig-bundle": "6.4.*",
-    "symfony/uid": "6.4.*",
-    "symfony/validator": "6.4.*",
-    "symfony/yaml": "6.4.*",
+    "symfony/property-access": "7.2.*",
+    "symfony/property-info": "7.2.*",
+    "symfony/security-bundle": "7.2.*",
+    "symfony/serializer": "7.2.*",
+    "symfony/translation": "7.2.*",
+    "symfony/twig-bundle": "7.2.*",
+    "symfony/uid": "7.2.*",
+    "symfony/validator": "7.2.*",
+    "symfony/yaml": "7.2.*",
     "twig/cssinliner-extra": "^3.20",
     "twig/extra-bundle": "^3.20",
     "twig/inky-extra": "^3.20",
@@ -82,13 +82,13 @@
     "phpstan/phpstan-symfony": "^2.0",
     "phpunit/phpunit": "^9.6",
     "rector/rector": "^2.0",
-    "symfony/browser-kit": "6.4.*",
-    "symfony/css-selector": "6.4.*",
-    "symfony/debug-bundle": "6.4.*",
+    "symfony/browser-kit": "7.2.*",
+    "symfony/css-selector": "7.2.*",
+    "symfony/debug-bundle": "7.2.*",
     "symfony/maker-bundle": "^1.48",
-    "symfony/phpunit-bridge": "6.4.*",
-    "symfony/stopwatch": "6.4.*",
-    "symfony/web-profiler-bundle": "6.4.*",
+    "symfony/phpunit-bridge": "7.2.*",
+    "symfony/stopwatch": "7.2.*",
+    "symfony/web-profiler-bundle": "7.2.*",
     "timeweb/phpstan-enum": "^4.0",
     "zenstruck/foundry": "2.3"
   },
@@ -147,7 +147,7 @@
   "extra": {
     "symfony": {
       "allow-contrib": false,
-      "require": "6.4.*"
+      "require": "7.2.*"
     },
     "phpstan": {
       "includes": [

+ 0 - 6
src/Entity/Billing/BillAccessDetail.php

@@ -25,10 +25,4 @@ class BillAccessDetail
     {
         return $this->id;
     }
-
-    public function setId(?int $id): self
-    {
-        $this->id = $id;
-        return $this;
-    }
 }

+ 6 - 4
src/Entity/Organization/Organization.php

@@ -57,9 +57,11 @@ use JetBrains\PhpStorm\Pure;
  *
  *   * @see \App\Doctrine\Organization\CurrentOrganizationExtension
  */
-#[ApiResource(operations: [
-    new Get(security: 'object.getId() == user.getOrganization().getId()'),
-])]
+#[ApiResource(
+    operations: [
+        new Get(security: 'object.getId() == user.getOrganization().getId()'),
+    ]
+)]
 // #[Auditable]
 #[ORM\Entity(repositoryClass: OrganizationRepository::class)]
 class Organization
@@ -481,7 +483,7 @@ class Organization
 
     public function getNetworkOrganizations(): Collection
     {
-        return $this->networkOrganizations;
+        return new ArrayCollection([]);
     }
 
     public function addNetworkOrganization(NetworkOrganization $networkOrganization): self

+ 2 - 2
src/Serializer/DefaultNormalizer.php

@@ -41,7 +41,7 @@ final class DefaultNormalizer implements NormalizerInterface, DenormalizerInterf
      *
      * @throws ExceptionInterface
      */
-    public function normalize($object, $format = null, array $context = []): mixed
+    public function normalize($object, $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
     {
         return $this->decorated->normalize($object, $format, $context);
     }
@@ -84,6 +84,6 @@ final class DefaultNormalizer implements NormalizerInterface, DenormalizerInterf
      * @return string[]
      */
     public function getSupportedTypes(?string $format): array {
-        return ['*'];
+        return $this->decorated->getSupportedTypes($format);
     }
 }