symfony · nexsja · Nov 20, 2024 · Nov 20, 2024 · Nov 20, 2024 · Nov 20, 2024
diff --git a/.gitattributes b/.gitattributes
@@ -7,5 +7,7 @@
 /src/Symfony/Component/Translation/Bridge export-ignore
 /src/Symfony/Component/Emoji/Resources/data/* linguist-generated=true
 /src/Symfony/Component/Intl/Resources/data/*/* linguist-generated=true
+/src/Symfony/Component/JsonEncoder/Tests/Fixtures/encoder/* linguist-generated=true
+/src/Symfony/Component/JsonEncoder/Tests/Fixtures/decoder/* linguist-generated=true
 /src/Symfony/**/.github/workflows/close-pull-request.yml linguist-generated=true
 /src/Symfony/**/.github/PULL_REQUEST_TEMPLATE.md linguist-generated=true
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -33,6 +33,9 @@ jobs:
             mode: low-deps
           - php: '8.3'
           - php: '8.4'
+            # brotli and zstd extensions are optional, when not present the commands will be used instead,
+            # we must test both scenarios
+            extensions: amqp,apcu,brotli,igbinary,intl,mbstring,memcached,redis,relay,zstd
           - php: '8.5'
             #mode: experimental
       fail-fast: false
@@ -54,6 +57,12 @@ jobs:
           extensions: "${{ matrix.extensions || env.extensions }}"
           tools: flex
 
+      - name: Install optional commands
+        if: matrix.php == '8.4'
+        run: |
+          sudo apt-get update
+          sudo apt-get install zopfli
+
       - name: Configure environment
         run: |
           git config --global user.email ""

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -56,6 +56,8 @@
             ->notPath('Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php')
             // stop removing spaces on the end of the line in strings
             ->notPath('Symfony/Component/Messenger/Tests/Command/FailedMessagesShowCommandTest.php')
+            // disable to not apply `native_function_invocation` rule, as we explicitly break it for testability reason, ref https://github.com/symfony/symfony/pull/59195
+            ->notPath('Symfony/Component/Mailer/Transport/NativeTransportFactory.php')
             // auto-generated proxies
             ->notPath('Symfony/Component/Cache/Traits/RelayProxy.php')
             ->notPath('Symfony/Component/Cache/Traits/Redis5Proxy.php')

diff --git a/composer.json b/composer.json
@@ -83,6 +83,7 @@
         "symfony/http-foundation": "self.version",
         "symfony/http-kernel": "self.version",
         "symfony/intl": "self.version",
+        "symfony/json-encoder": "self.version",
         "symfony/ldap": "self.version",
         "symfony/lock": "self.version",
         "symfony/mailer": "self.version",

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
@@ -172,7 +172,7 @@ public function getIterator(): \Traversable
 
             public function count(): int
             {
-                return count($this->array);
+                return \count($this->array);
             }
         };
 

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
@@ -110,7 +110,7 @@
 }
 
 if (version_compare($PHPUNIT_VERSION, '10.0', '>=') && version_compare($PHPUNIT_VERSION, '11.0', '<')) {
-    fwrite(STDERR, 'This script does not work with PHPUnit 10.'.\PHP_EOL);
+    fwrite(\STDERR, 'This script does not work with PHPUnit 10.'.\PHP_EOL);
     exit(1);
 }
 

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php
@@ -80,7 +80,7 @@ public function testGenerateFragmentUri()
         ]);
         $twig->addRuntimeLoader($loader);
 
-        $this->assertSame('/_fragment?_hash=XCg0hX8QzSwik8Xuu9aMXhoCeI4oJOob7lUVacyOtyY%3D&amp;_path=template%3Dfoo.html.twig%26_format%3Dhtml%26_locale%3Den%26_controller%3DSymfony%255CBundle%255CFrameworkBundle%255CController%255CTemplateController%253A%253AtemplateAction', $twig->render('index'));
+        $this->assertSame('/_fragment?_hash=XCg0hX8QzSwik8Xuu9aMXhoCeI4oJOob7lUVacyOtyY&amp;_path=template%3Dfoo.html.twig%26_format%3Dhtml%26_locale%3Den%26_controller%3DSymfony%255CBundle%255CFrameworkBundle%255CController%255CTemplateController%253A%253AtemplateAction', $twig->render('index'));
     }
 
     protected function getFragmentHandler($returnOrException): FragmentHandler

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -32,7 +32,7 @@
         "symfony/finder": "^6.4|^7.0",
         "symfony/form": "^6.4|^7.0",
         "symfony/html-sanitizer": "^6.4|^7.0",
-        "symfony/http-foundation": "^6.4|^7.0",
+        "symfony/http-foundation": "^7.3",
         "symfony/http-kernel": "^6.4|^7.0",
         "symfony/intl": "^6.4|^7.0",
         "symfony/mime": "^6.4|^7.0",

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+7.3
+---
+
+ * Add support for assets pre-compression
+ * Rename `TranslationUpdateCommand` to `TranslationExtractCommand`
+ * Add JsonEncoder services and configuration
+
 7.2
 ---
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
@@ -84,9 +84,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             ['Architecture', (\PHP_INT_SIZE * 8).' bits'],
             ['Intl locale', class_exists(\Locale::class, false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a'],
             ['Timezone', date_default_timezone_get().' (<comment>'.(new \DateTimeImmutable())->format(\DateTimeInterface::W3C).'</>)'],
-            ['OPcache', \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
-            ['APCu', \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
-            ['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && 'off' !== $xdebugMode ? 'Enabled (' . $xdebugMode . ')' : 'Not enabled') : 'Not installed'],
+            ['OPcache', \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
+            ['APCu', \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
+            ['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && 'off' !== $xdebugMode ? 'Enabled ('.$xdebugMode.')' : 'Not enabled') : 'Not installed'],
         ];
 
         $io->table([], $rows);
-Original file line number
+Diff line change
@@ Expand Up / @@ -172,7 +172,7 @@ public function getIterator(): \Traversable @@
                 public function count(): int
                 {
-                    return count($this->array);
+                    return \count($this->array);
                 }
             };
@@ Expand Down @@