Update recipes 2023-07-19 #44
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
symfony-php-recipes-bot
force-pushed
the
bot-code-update
branch
from
23fb6c9 to
6c6020a
Compare
|
Thanks for the PR 😍 How to test these changes in your application
Diff between recipe versionsIn order to help with the review stage, I'm in charge of computing the diff between the various versions of patched recipes. doctrine/doctrine-bundle1.6 vs 1.12diff --git a/doctrine/doctrine-bundle/1.6/config/packages/doctrine.php b/doctrine/doctrine-bundle/1.12/config/packages/doctrine.php
index c93732f..aa66d26 100644
--- a/doctrine/doctrine-bundle/1.6/config/packages/doctrine.php
+++ b/doctrine/doctrine-bundle/1.12/config/packages/doctrine.php
@@ -15,7 +15,7 @@ return static function (ContainerConfigurator $containerConfigurator): void {
],
'orm' => [
'auto_generate_proxy_classes' => true,
- 'naming_strategy' => 'doctrine.orm.naming_strategy.underscore',
+ 'naming_strategy' => 'doctrine.orm.naming_strategy.underscore_number_aware',
'auto_mapping' => true,
'mappings' => [
'App' => [
diff --git a/doctrine/doctrine-bundle/1.6/config/packages/prod/doctrine.php b/doctrine/doctrine-bundle/1.12/config/packages/prod/doctrine.php
index a6dfabd..dd81ae3 100644
--- a/doctrine/doctrine-bundle/1.6/config/packages/prod/doctrine.php
+++ b/doctrine/doctrine-bundle/1.12/config/packages/prod/doctrine.php
@@ -3,37 +3,26 @@
declare(strict_types=1);
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
return static function (ContainerConfigurator $containerConfigurator): void {
$containerConfigurator->extension('doctrine', [
'orm' => [
'auto_generate_proxy_classes' => false,
'metadata_cache_driver' => [
- 'type' => 'service',
- 'id' => 'doctrine.system_cache_provider',
+ 'type' => 'pool',
+ 'pool' => 'doctrine.system_cache_pool',
],
'query_cache_driver' => [
- 'type' => 'service',
- 'id' => 'doctrine.system_cache_provider',
+ 'type' => 'pool',
+ 'pool' => 'doctrine.system_cache_pool',
],
'result_cache_driver' => [
- 'type' => 'service',
- 'id' => 'doctrine.result_cache_provider',
+ 'type' => 'pool',
+ 'pool' => 'doctrine.result_cache_pool',
],
],
]);
- $services = $containerConfigurator->services();
-
- $services->set('doctrine.result_cache_provider', 'Symfony\Component\Cache\DoctrineProvider')
- ->private()
- ->args([service('doctrine.result_cache_pool')]);
-
- $services->set('doctrine.system_cache_provider', 'Symfony\Component\Cache\DoctrineProvider')
- ->private()
- ->args([service('doctrine.system_cache_pool')]);
-
$containerConfigurator->extension('framework', [
'cache' => [
'pools' => [
diff --git a/doctrine/doctrine-bundle/1.6/manifest.json b/doctrine/doctrine-bundle/1.12/manifest.json
index dca9096..754bce8 100644
--- a/doctrine/doctrine-bundle/1.6/manifest.json
+++ b/doctrine/doctrine-bundle/1.12/manifest.json
@@ -11,8 +11,8 @@
"#2": "IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml",
"#3": "",
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
- "#5": "DATABASE_URL=\"mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8\"",
- "DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8"
+ "#5": "DATABASE_URL=\"mysql://app:!ChangeMe!@127.0.0.1:3306/db_name?serverVersion=8\"",
+ "DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/db_name?serverVersion=15&charset=utf8"
},
"dockerfile": [
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev && \\",1.12 vs 2.0diff --git a/doctrine/doctrine-bundle/1.12/config/packages/doctrine.php b/doctrine/doctrine-bundle/2.0/config/packages/doctrine.php
index aa66d26..e210ec1 100644
--- a/doctrine/doctrine-bundle/1.12/config/packages/doctrine.php
+++ b/doctrine/doctrine-bundle/2.0/config/packages/doctrine.php
@@ -8,10 +8,6 @@ return static function (ContainerConfigurator $containerConfigurator): void {
$containerConfigurator->extension('doctrine', [
'dbal' => [
'url' => '%env(resolve:DATABASE_URL)%',
- 'charset' => 'utf8mb4',
- 'default_table_options' => [
- 'collate' => 'utf8mb4_unicode_ci',
- ],
],
'orm' => [
'auto_generate_proxy_classes' => true,
diff --git a/doctrine/doctrine-bundle/1.12/manifest.json b/doctrine/doctrine-bundle/2.0/manifest.json
index 754bce8..dca9096 100644
--- a/doctrine/doctrine-bundle/1.12/manifest.json
+++ b/doctrine/doctrine-bundle/2.0/manifest.json
@@ -11,8 +11,8 @@
"#2": "IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml",
"#3": "",
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
- "#5": "DATABASE_URL=\"mysql://app:!ChangeMe!@127.0.0.1:3306/db_name?serverVersion=8\"",
- "DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/db_name?serverVersion=15&charset=utf8"
+ "#5": "DATABASE_URL=\"mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8\"",
+ "DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8"
},
"dockerfile": [
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev && \\",2.0 vs 2.3diff --git a/doctrine/doctrine-bundle/2.0/config/packages/prod/doctrine.php b/doctrine/doctrine-bundle/2.3/config/packages/prod/doctrine.php
index dd81ae3..20e0bf6 100644
--- a/doctrine/doctrine-bundle/2.0/config/packages/prod/doctrine.php
+++ b/doctrine/doctrine-bundle/2.3/config/packages/prod/doctrine.php
@@ -8,10 +8,6 @@ return static function (ContainerConfigurator $containerConfigurator): void {
$containerConfigurator->extension('doctrine', [
'orm' => [
'auto_generate_proxy_classes' => false,
- 'metadata_cache_driver' => [
- 'type' => 'pool',
- 'pool' => 'doctrine.system_cache_pool',
- ],
'query_cache_driver' => [
'type' => 'pool',
'pool' => 'doctrine.system_cache_pool',
diff --git a/doctrine/doctrine-bundle/2.3/config/packages/test/doctrine.php b/doctrine/doctrine-bundle/2.3/config/packages/test/doctrine.php
new file mode 100644
index 0000000..d1f2212
--- /dev/null
+++ b/doctrine/doctrine-bundle/2.3/config/packages/test/doctrine.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+ $containerConfigurator->extension('doctrine', [
+ 'dbal' => [
+ 'dbname' => 'main_test%env(default::TEST_TOKEN)%',
+ ],
+ ]);
+};
diff --git a/doctrine/doctrine-bundle/2.0/manifest.json b/doctrine/doctrine-bundle/2.3/manifest.json
index dca9096..f673cbc 100644
--- a/doctrine/doctrine-bundle/2.0/manifest.json
+++ b/doctrine/doctrine-bundle/2.3/manifest.json
@@ -11,13 +11,13 @@
"#2": "IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml",
"#3": "",
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
- "#5": "DATABASE_URL=\"mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8\"",
+ "#5": "DATABASE_URL=\"mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8&charset=utf8mb4\"",
"DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8"
},
"dockerfile": [
- "RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev && \\",
- "\tdocker-php-ext-install -j$(nproc) pdo_pgsql && \\",
- "\tapk add --no-cache --virtual .pgsql-rundeps so:libpq.so.5 && \\",
+ "RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev; \\",
+ "\tdocker-php-ext-install -j$(nproc) pdo_pgsql; \\",
+ "\tapk add --no-cache --virtual .pgsql-rundeps so:libpq.so.5; \\",
"\tapk del .pgsql-deps"
],
"docker-compose": {2.3 vs 2.4diff --git a/doctrine/doctrine-bundle/2.3/config/packages/doctrine.php b/doctrine/doctrine-bundle/2.4/config/packages/doctrine.php
index e210ec1..401ce10 100644
--- a/doctrine/doctrine-bundle/2.3/config/packages/doctrine.php
+++ b/doctrine/doctrine-bundle/2.4/config/packages/doctrine.php
@@ -16,7 +16,6 @@ return static function (ContainerConfigurator $containerConfigurator): void {
'mappings' => [
'App' => [
'is_bundle' => false,
- 'type' => 'annotation',
'dir' => '%kernel.project_dir%/src/Entity',
'prefix' => 'App\Entity',
'alias' => 'App',
@@ -24,4 +23,39 @@ return static function (ContainerConfigurator $containerConfigurator): void {
],
],
]);
+ if ($containerConfigurator->env() === 'test') {
+ $containerConfigurator->extension('doctrine', [
+ 'dbal' => [
+ 'dbname_suffix' => '_test%env(default::TEST_TOKEN)%',
+ ],
+ ]);
+ }
+ if ($containerConfigurator->env() === 'prod') {
+ $containerConfigurator->extension('doctrine', [
+ 'orm' => [
+ 'auto_generate_proxy_classes' => false,
+ 'proxy_dir' => '%kernel.build_dir%/doctrine/orm/Proxies',
+ 'query_cache_driver' => [
+ 'type' => 'pool',
+ 'pool' => 'doctrine.system_cache_pool',
+ ],
+ 'result_cache_driver' => [
+ 'type' => 'pool',
+ 'pool' => 'doctrine.result_cache_pool',
+ ],
+ ],
+ ]);
+ $containerConfigurator->extension('framework', [
+ 'cache' => [
+ 'pools' => [
+ 'doctrine.result_cache_pool' => [
+ 'adapter' => 'cache.app',
+ ],
+ 'doctrine.system_cache_pool' => [
+ 'adapter' => 'cache.system',
+ ],
+ ],
+ ],
+ ]);
+ }
};
diff --git a/doctrine/doctrine-bundle/2.3/config/packages/prod/doctrine.php b/doctrine/doctrine-bundle/2.3/config/packages/prod/doctrine.php
deleted file mode 100644
index 20e0bf6..0000000
--- a/doctrine/doctrine-bundle/2.3/config/packages/prod/doctrine.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-
-return static function (ContainerConfigurator $containerConfigurator): void {
- $containerConfigurator->extension('doctrine', [
- 'orm' => [
- 'auto_generate_proxy_classes' => false,
- 'query_cache_driver' => [
- 'type' => 'pool',
- 'pool' => 'doctrine.system_cache_pool',
- ],
- 'result_cache_driver' => [
- 'type' => 'pool',
- 'pool' => 'doctrine.result_cache_pool',
- ],
- ],
- ]);
-
- $containerConfigurator->extension('framework', [
- 'cache' => [
- 'pools' => [
- 'doctrine.result_cache_pool' => [
- 'adapter' => 'cache.app',
- ],
- 'doctrine.system_cache_pool' => [
- 'adapter' => 'cache.system',
- ],
- ],
- ],
- ]);
-};
diff --git a/doctrine/doctrine-bundle/2.3/config/packages/test/doctrine.php b/doctrine/doctrine-bundle/2.3/config/packages/test/doctrine.php
deleted file mode 100644
index d1f2212..0000000
--- a/doctrine/doctrine-bundle/2.3/config/packages/test/doctrine.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-
-return static function (ContainerConfigurator $containerConfigurator): void {
- $containerConfigurator->extension('doctrine', [
- 'dbal' => [
- 'dbname' => 'main_test%env(default::TEST_TOKEN)%',
- ],
- ]);
-};
diff --git a/doctrine/doctrine-bundle/2.3/manifest.json b/doctrine/doctrine-bundle/2.4/manifest.json
index f673cbc..472f48f 100644
--- a/doctrine/doctrine-bundle/2.3/manifest.json
+++ b/doctrine/doctrine-bundle/2.4/manifest.json
@@ -44,5 +44,8 @@
" - \"5432\""
]
}
+ },
+ "conflict": {
+ "symfony/framework-bundle": "<5.3"
}
}2.4 vs 2.8diff --git a/doctrine/doctrine-bundle/2.4/config/packages/doctrine.php b/doctrine/doctrine-bundle/2.8/config/packages/doctrine.php
index 401ce10..d625cfa 100644
--- a/doctrine/doctrine-bundle/2.4/config/packages/doctrine.php
+++ b/doctrine/doctrine-bundle/2.8/config/packages/doctrine.php
@@ -11,6 +11,7 @@ return static function (ContainerConfigurator $containerConfigurator): void {
],
'orm' => [
'auto_generate_proxy_classes' => true,
+ 'enable_lazy_ghost_objects' => true,
'naming_strategy' => 'doctrine.orm.naming_strategy.underscore_number_aware',
'auto_mapping' => true,
'mappings' => [
diff --git a/doctrine/doctrine-bundle/2.4/manifest.json b/doctrine/doctrine-bundle/2.8/manifest.json
index 472f48f..fc8c043 100644
--- a/doctrine/doctrine-bundle/2.4/manifest.json
+++ b/doctrine/doctrine-bundle/2.8/manifest.json
@@ -11,12 +11,13 @@
"#2": "IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml",
"#3": "",
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
- "#5": "DATABASE_URL=\"mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8&charset=utf8mb4\"",
+ "#5": "DATABASE_URL=\"mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4\"",
+ "#6": "DATABASE_URL=\"mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4\"",
"DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8"
},
"dockerfile": [
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev; \\",
- "\tdocker-php-ext-install -j$(nproc) pdo_pgsql; \\",
+ "\tdocker-php-ext-install -j\"$(nproc)\" pdo_pgsql; \\",
"\tapk add --no-cache --virtual .pgsql-rundeps so:libpq.so.5; \\",
"\tapk del .pgsql-deps"
],
@@ -46,6 +47,8 @@
}
},
"conflict": {
+ "doctrine/orm": "<2.14",
+ "symfony/dependency-injection": "<6.2",
"symfony/framework-bundle": "<5.3"
}
}2.8 vs 2.10diff --git a/doctrine/doctrine-bundle/2.8/config/packages/doctrine.php b/doctrine/doctrine-bundle/2.10/config/packages/doctrine.php
index d625cfa..ad0307f 100644
--- a/doctrine/doctrine-bundle/2.8/config/packages/doctrine.php
+++ b/doctrine/doctrine-bundle/2.10/config/packages/doctrine.php
@@ -8,10 +8,13 @@ return static function (ContainerConfigurator $containerConfigurator): void {
$containerConfigurator->extension('doctrine', [
'dbal' => [
'url' => '%env(resolve:DATABASE_URL)%',
+ 'profiling_collect_backtrace' => '%kernel.debug%',
],
'orm' => [
'auto_generate_proxy_classes' => true,
'enable_lazy_ghost_objects' => true,
+ 'report_fields_where_declared' => true,
+ 'validate_xml_mapping' => true,
'naming_strategy' => 'doctrine.orm.naming_strategy.underscore_number_aware',
'auto_mapping' => true,
'mappings' => [phpunit/phpunit4.7 vs 9.3diff --git a/phpunit/phpunit/4.7/phpunit.xml.dist b/phpunit/phpunit/9.3/phpunit.xml.dist
index db2b29d..23ea5cf 100644
--- a/phpunit/phpunit/4.7/phpunit.xml.dist
+++ b/phpunit/phpunit/9.3/phpunit.xml.dist
@@ -6,12 +6,15 @@
backupGlobals="false"
colors="true"
bootstrap="tests/bootstrap.php"
+ convertDeprecationsToExceptions="false"
>
<php>
<ini name="display_errors" value="1" />
<ini name="error_reporting" value="-1" />
<server name="APP_ENV" value="test" force="true" />
<server name="SHELL_VERBOSITY" value="-1" />
+ <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
+ <server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
</php>
<testsuites>
@@ -20,11 +23,11 @@
</testsuite>
</testsuites>
- <filter>
- <whitelist processUncoveredFilesFromWhitelist="true">
+ <coverage processUncoveredFiles="true">
+ <include>
<directory suffix=".php">src</directory>
- </whitelist>
- </filter>
+ </include>
+ </coverage>
<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />9.3 vs 9.6diff --git a/phpunit/phpunit/9.3/phpunit.xml.dist b/phpunit/phpunit/9.6/phpunit.xml.dist
index 23ea5cf..6c4bfed 100644
--- a/phpunit/phpunit/9.3/phpunit.xml.dist
+++ b/phpunit/phpunit/9.6/phpunit.xml.dist
@@ -33,8 +33,6 @@
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
</listeners>
- <!-- Uncomment when adding extensions
<extensions>
</extensions>
- -->
</phpunit>symfony/google-chat-notifier5.2 vs 5.3diff --git a/symfony/google-chat-notifier/5.2/manifest.json b/symfony/google-chat-notifier/5.3/manifest.json
index 9ee2643..b91559a 100644
--- a/symfony/google-chat-notifier/5.2/manifest.json
+++ b/symfony/google-chat-notifier/5.3/manifest.json
@@ -10,6 +10,6 @@
],
"env": {
"#1": "See https://developers.google.com/hangouts/chat/how-tos/webhooks",
- "#2": "GOOGLE_CHAT_DSN=googlechat://ACCESS_KEY:ACCESS_TOKEN@default/SPACE?threadKey=THREAD_KEY"
+ "#2": "GOOGLE_CHAT_DSN=googlechat://ACCESS_KEY:ACCESS_TOKEN@default/SPACE?thread_key=THREAD_KEY"
}
}symfony/phpunit-bridge3.3 vs 4.1diff --git a/symfony/phpunit-bridge/3.3/.env.test b/symfony/phpunit-bridge/4.1/.env.test
index 24a43c0..9e7162f 100644
--- a/symfony/phpunit-bridge/3.3/.env.test
+++ b/symfony/phpunit-bridge/4.1/.env.test
@@ -2,3 +2,5 @@
KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st'
SYMFONY_DEPRECATIONS_HELPER=999999
+PANTHER_APP_ENV=panther
+PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
diff --git a/symfony/phpunit-bridge/3.3/bin/phpunit b/symfony/phpunit-bridge/4.1/bin/phpunit
index 0b79fd4..63dae24 100755
--- a/symfony/phpunit-bridge/3.3/bin/phpunit
+++ b/symfony/phpunit-bridge/4.1/bin/phpunit
@@ -6,12 +6,6 @@ if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-php
exit(1);
}
-if (false === getenv('SYMFONY_PHPUNIT_VERSION')) {
- putenv('SYMFONY_PHPUNIT_VERSION=6.5');
-}
-if (false === getenv('SYMFONY_PHPUNIT_REMOVE')) {
- putenv('SYMFONY_PHPUNIT_REMOVE=symfony/yaml');
-}
if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
}
diff --git a/symfony/phpunit-bridge/3.3/phpunit.xml.dist b/symfony/phpunit-bridge/4.1/phpunit.xml.dist
index 294a559..d81f0c3 100644
--- a/symfony/phpunit-bridge/3.3/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/4.1/phpunit.xml.dist
@@ -8,10 +8,11 @@
bootstrap="tests/bootstrap.php"
>
<php>
- <ini name="display_errors" value="1" />
<ini name="error_reporting" value="-1" />
<server name="APP_ENV" value="test" force="true" />
<server name="SHELL_VERBOSITY" value="-1" />
+ <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
+ <server name="SYMFONY_PHPUNIT_VERSION" value="7.5" />
</php>
<testsuites>
@@ -21,8 +22,8 @@
</testsuites>
<filter>
- <whitelist>
- <directory>src</directory>
+ <whitelist processUncoveredFilesFromWhitelist="true">
+ <directory suffix=".php">src</directory>
</whitelist>
</filter>
4.1 vs 4.3diff --git a/symfony/phpunit-bridge/4.1/bin/phpunit b/symfony/phpunit-bridge/4.3/bin/phpunit
index 63dae24..4d1ed05 100755
--- a/symfony/phpunit-bridge/4.1/bin/phpunit
+++ b/symfony/phpunit-bridge/4.3/bin/phpunit
@@ -1,8 +1,8 @@
#!/usr/bin/env php
<?php
-if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
- echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
+if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
+ echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
exit(1);
}
@@ -10,4 +10,4 @@ if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
}
-require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';
+require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
diff --git a/symfony/phpunit-bridge/4.1/phpunit.xml.dist b/symfony/phpunit-bridge/4.3/phpunit.xml.dist
index d81f0c3..5766779 100644
--- a/symfony/phpunit-bridge/4.1/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/4.3/phpunit.xml.dist
@@ -8,6 +8,7 @@
bootstrap="tests/bootstrap.php"
>
<php>
+ <ini name="display_errors" value="1" />
<ini name="error_reporting" value="-1" />
<server name="APP_ENV" value="test" force="true" />
<server name="SHELL_VERBOSITY" value="-1" />4.3 vs 5.1diff --git a/symfony/phpunit-bridge/4.3/phpunit.xml.dist b/symfony/phpunit-bridge/5.1/phpunit.xml.dist
index 5766779..40593c6 100644
--- a/symfony/phpunit-bridge/4.3/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/5.1/phpunit.xml.dist
@@ -8,12 +8,11 @@
bootstrap="tests/bootstrap.php"
>
<php>
- <ini name="display_errors" value="1" />
<ini name="error_reporting" value="-1" />
<server name="APP_ENV" value="test" force="true" />
<server name="SHELL_VERBOSITY" value="-1" />
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
- <server name="SYMFONY_PHPUNIT_VERSION" value="7.5" />
+ <server name="SYMFONY_PHPUNIT_VERSION" value="8.5" />
</php>
<testsuites>
@@ -31,4 +30,9 @@
<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
</listeners>
+
+ <!-- Uncomment when adding extensions
+ <extensions>
+ </extensions>
+ -->
</phpunit>5.1 vs 5.3diff --git a/symfony/phpunit-bridge/5.1/bin/phpunit b/symfony/phpunit-bridge/5.3/bin/phpunit
index 4d1ed05..f26f2c7 100755
--- a/symfony/phpunit-bridge/5.1/bin/phpunit
+++ b/symfony/phpunit-bridge/5.3/bin/phpunit
@@ -1,13 +1,19 @@
#!/usr/bin/env php
<?php
-if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
- echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
- exit(1);
+if (!ini_get('date.timezone')) {
+ ini_set('date.timezone', 'UTC');
}
-if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
- putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
-}
+if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
+ define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
+ require PHPUNIT_COMPOSER_INSTALL;
+ PHPUnit\TextUI\Command::main();
+} else {
+ if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
+ echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
+ exit(1);
+ }
-require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
+ require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
+}
diff --git a/symfony/phpunit-bridge/5.1/manifest.json b/symfony/phpunit-bridge/5.3/manifest.json
index a2ed0cb..4fb292b 100644
--- a/symfony/phpunit-bridge/5.1/manifest.json
+++ b/symfony/phpunit-bridge/5.3/manifest.json
@@ -6,7 +6,6 @@
"tests/": "tests/"
},
"gitignore": [
- ".phpunit",
".phpunit.result.cache",
"/phpunit.xml"
],
diff --git a/symfony/phpunit-bridge/5.1/phpunit.xml.dist b/symfony/phpunit-bridge/5.3/phpunit.xml.dist
index 40593c6..23ea5cf 100644
--- a/symfony/phpunit-bridge/5.1/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/5.3/phpunit.xml.dist
@@ -2,17 +2,19 @@
<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="bin/.phpunit/phpunit.xsd"
+ xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="tests/bootstrap.php"
+ convertDeprecationsToExceptions="false"
>
<php>
+ <ini name="display_errors" value="1" />
<ini name="error_reporting" value="-1" />
<server name="APP_ENV" value="test" force="true" />
<server name="SHELL_VERBOSITY" value="-1" />
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
- <server name="SYMFONY_PHPUNIT_VERSION" value="8.5" />
+ <server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
</php>
<testsuites>
@@ -21,11 +23,11 @@
</testsuite>
</testsuites>
- <filter>
- <whitelist processUncoveredFilesFromWhitelist="true">
+ <coverage processUncoveredFiles="true">
+ <include>
<directory suffix=".php">src</directory>
- </whitelist>
- </filter>
+ </include>
+ </coverage>
<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
diff --git a/symfony/phpunit-bridge/5.1/post-install.txt b/symfony/phpunit-bridge/5.3/post-install.txt
index 2db39ab..e9da2a6 100644
--- a/symfony/phpunit-bridge/5.1/post-install.txt
+++ b/symfony/phpunit-bridge/5.3/post-install.txt
@@ -1,2 +1,3 @@
* Write test cases in the tests/ folder
- * Run php bin/phpunit
+ * Use MakerBundle's make:test command as a shortcut!
+ * Run the tests with php bin/phpunit5.3 vs 6.3diff --git a/symfony/phpunit-bridge/5.3/manifest.json b/symfony/phpunit-bridge/6.3/manifest.json
index 4fb292b..482a1a4 100644
--- a/symfony/phpunit-bridge/5.3/manifest.json
+++ b/symfony/phpunit-bridge/6.3/manifest.json
@@ -9,5 +9,8 @@
".phpunit.result.cache",
"/phpunit.xml"
],
+ "conflict": {
+ "phpunit/phpunit": "<9.6"
+ },
"aliases": ["simple-phpunit"]
}
diff --git a/symfony/phpunit-bridge/5.3/phpunit.xml.dist b/symfony/phpunit-bridge/6.3/phpunit.xml.dist
index 23ea5cf..6c4bfed 100644
--- a/symfony/phpunit-bridge/5.3/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/6.3/phpunit.xml.dist
@@ -33,8 +33,6 @@
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
</listeners>
- <!-- Uncomment when adding extensions
<extensions>
</extensions>
- -->
</phpunit>symfony/postmark-mailer4.3 vs 4.4diff --git a/symfony/postmark-mailer/4.3/manifest.json b/symfony/postmark-mailer/4.4/manifest.json
index b6b855d..7bee685 100644
--- a/symfony/postmark-mailer/4.3/manifest.json
+++ b/symfony/postmark-mailer/4.4/manifest.json
@@ -1,6 +1,13 @@
{
+ "add-lines": [
+ {
+ "file": "config/packages/notifier.yaml",
+ "position": "after_target",
+ "target": " texter_transports:",
+ "content": " postmark: '%env(MAILER_DSN)%'"
+ }
+ ],
"env": {
- "#1": "POSTMARK_ID=",
- "#2": "MAILER_DSN=smtp://$POSTMARK_ID@postmark"
+ "#1": "MAILER_DSN=postmark://ID@default"
}
}symfony/sendgrid-mailer4.3 vs 4.4diff --git a/symfony/sendgrid-mailer/4.3/manifest.json b/symfony/sendgrid-mailer/4.4/manifest.json
index 891842c..1fef72d 100644
--- a/symfony/sendgrid-mailer/4.3/manifest.json
+++ b/symfony/sendgrid-mailer/4.4/manifest.json
@@ -1,6 +1,13 @@
{
+ "add-lines": [
+ {
+ "file": "config/packages/notifier.yaml",
+ "position": "after_target",
+ "target": " texter_transports:",
+ "content": " sendgrid: '%env(MAILER_DSN)%'"
+ }
+ ],
"env": {
- "#1": "SENDGRID_KEY=",
- "#2": "MAILER_DSN=smtp://$SENDGRID_KEY@sendgrid"
+ "#1": "MAILER_DSN=sendgrid://KEY@default"
}
}symfony/slack-notifier5.0 vs 5.1diff --git a/symfony/slack-notifier/5.0/manifest.json b/symfony/slack-notifier/5.1/manifest.json
index ea1475e..376c462 100644
--- a/symfony/slack-notifier/5.0/manifest.json
+++ b/symfony/slack-notifier/5.1/manifest.json
@@ -9,6 +9,7 @@
}
],
"env": {
- "#1": "SLACK_DSN=slack://TOKEN@default?channel=CHANNEL"
+ "#1": "See https://api.slack.com/messaging/webhooks",
+ "#2": "SLACK_DSN=slack://default/ID"
}
}5.1 vs 5.2diff --git a/symfony/slack-notifier/5.1/manifest.json b/symfony/slack-notifier/5.2/manifest.json
index 376c462..ea1475e 100644
--- a/symfony/slack-notifier/5.1/manifest.json
+++ b/symfony/slack-notifier/5.2/manifest.json
@@ -9,7 +9,6 @@
}
],
"env": {
- "#1": "See https://api.slack.com/messaging/webhooks",
- "#2": "SLACK_DSN=slack://default/ID"
+ "#1": "SLACK_DSN=slack://TOKEN@default?channel=CHANNEL"
}
}symfony/ux-react2.8 vs 2.9diff --git a/symfony/ux-react/2.9/assets/react/controllers/Hello.jsx b/symfony/ux-react/2.9/assets/react/controllers/Hello.jsx
new file mode 100644
index 0000000..54fe368
--- /dev/null
+++ b/symfony/ux-react/2.9/assets/react/controllers/Hello.jsx
@@ -0,0 +1,5 @@
+import React from 'react';
+
+export default function (props) {
+ return <div>Hello {props.fullName}</div>;
+}
diff --git a/symfony/ux-react/2.8/manifest.json b/symfony/ux-react/2.9/manifest.json
index be0ff74..444d845 100644
--- a/symfony/ux-react/2.8/manifest.json
+++ b/symfony/ux-react/2.9/manifest.json
@@ -1,5 +1,40 @@
{
"bundles": {
"Symfony\\UX\\React\\ReactBundle": ["all"]
- }
+ },
+ "copy-from-recipe": {
+ "assets/": "assets/"
+ },
+ "conflict": {
+ "symfony/webpack-encore-bundle": "<2.0",
+ "symfony/flex": "<1.20.0 || >=2.0.0,<2.3.0"
+ },
+ "add-lines": [
+ {
+ "file": "webpack.config.js",
+ "content": "\n .enableReactPreset()",
+ "position": "after_target",
+ "target": ".splitEntryChunks()"
+ },
+ {
+ "file": "assets/app.js",
+ "content": "import { registerReactControllerComponents } from '@symfony/ux-react';",
+ "position": "top",
+ "warn_if_missing": true
+ },
+ {
+ "file": "assets/app.js",
+ "content": "registerReactControllerComponents(require.context('./react/controllers', true, /\\.(j|t)sx?$/));",
+ "position": "bottom",
+ "warn_if_missing": true,
+ "requires": "symfony/webpack-encore-bundle"
+ },
+ {
+ "file": "assets/app.js",
+ "content": "registerReactControllerComponents();",
+ "position": "bottom",
+ "warn_if_missing": true,
+ "requires": "symfony/asset-mapper"
+ }
+ ]
}symfony/ux-svelte2.8 vs 2.9diff --git a/symfony/ux-svelte/2.9/assets/svelte/controllers/Hello.svelte b/symfony/ux-svelte/2.9/assets/svelte/controllers/Hello.svelte
new file mode 100644
index 0000000..3499af4
--- /dev/null
+++ b/symfony/ux-svelte/2.9/assets/svelte/controllers/Hello.svelte
@@ -0,0 +1,5 @@
+<script>
+ export let name = "Svelte";
+</script>
+
+<div>Hello {name}</div>
diff --git a/symfony/ux-svelte/2.8/manifest.json b/symfony/ux-svelte/2.9/manifest.json
index 7c82371..c5e3457 100644
--- a/symfony/ux-svelte/2.8/manifest.json
+++ b/symfony/ux-svelte/2.9/manifest.json
@@ -1,5 +1,40 @@
{
"bundles": {
"Symfony\\UX\\Svelte\\SvelteBundle": ["all"]
- }
+ },
+ "copy-from-recipe": {
+ "assets/": "assets/"
+ },
+ "conflict": {
+ "symfony/webpack-encore-bundle": "<2.0",
+ "symfony/flex": "<1.20.0 || >=2.0.0,<2.3.0"
+ },
+ "add-lines": [
+ {
+ "file": "webpack.config.js",
+ "content": "\n .enableSvelte()",
+ "position": "after_target",
+ "target": ".splitEntryChunks()"
+ },
+ {
+ "file": "assets/app.js",
+ "content": "import { registerSvelteControllerComponents } from '@symfony/ux-svelte';",
+ "position": "top",
+ "warn_if_missing": true
+ },
+ {
+ "file": "assets/app.js",
+ "content": "registerSvelteControllerComponents(require.context('./svelte/controllers', true, /\\.svelte$/));",
+ "position": "bottom",
+ "warn_if_missing": true,
+ "requires": "symfony/webpack-encore-bundle"
+ },
+ {
+ "file": "assets/app.js",
+ "content": "registerSvelteControllerComponents();",
+ "position": "bottom",
+ "warn_if_missing": true,
+ "requires": "symfony/asset-mapper"
+ }
+ ]
}symfony/ux-vue2.8 vs 2.9diff --git a/symfony/ux-vue/2.9/assets/vue/controllers/Hello.vue b/symfony/ux-vue/2.9/assets/vue/controllers/Hello.vue
new file mode 100644
index 0000000..2812aa4
--- /dev/null
+++ b/symfony/ux-vue/2.9/assets/vue/controllers/Hello.vue
@@ -0,0 +1,9 @@
+<template>
+ <div>Hello {{ name }}!</div>
+</template>
+
+<script setup>
+ defineProps({
+ name: String
+ });
+</script>
diff --git a/symfony/ux-vue/2.8/manifest.json b/symfony/ux-vue/2.9/manifest.json
index 9010c6f..2682a62 100644
--- a/symfony/ux-vue/2.8/manifest.json
+++ b/symfony/ux-vue/2.9/manifest.json
@@ -1,5 +1,40 @@
{
"bundles": {
"Symfony\\UX\\Vue\\VueBundle": ["all"]
- }
+ },
+ "copy-from-recipe": {
+ "assets/": "assets/"
+ },
+ "conflict": {
+ "symfony/webpack-encore-bundle": "<2.0",
+ "symfony/flex": "<1.20.0 || >=2.0.0,<2.3.0"
+ },
+ "add-lines": [
+ {
+ "file": "webpack.config.js",
+ "content": "\n .enableVueLoader()",
+ "position": "after_target",
+ "target": ".splitEntryChunks()"
+ },
+ {
+ "file": "assets/app.js",
+ "content": "import { registerVueControllerComponents } from '@symfony/ux-vue';",
+ "position": "top",
+ "warn_if_missing": true
+ },
+ {
+ "file": "assets/app.js",
+ "content": "registerVueControllerComponents(require.context('./vue/controllers', true, /\\.vue$/));",
+ "position": "bottom",
+ "warn_if_missing": true,
+ "requires": "symfony/webpack-encore-bundle"
+ },
+ {
+ "file": "assets/app.js",
+ "content": "registerVueControllerComponents();",
+ "position": "bottom",
+ "warn_if_missing": true,
+ "requires": "symfony/asset-mapper"
+ }
+ ]
} |
Comment on lines
+6
to
+8
| "warn_if_missing": true, | ||
| "target": " texter_transports:", | ||
| "content": " allmysms: '%env(ALLMYSMS_DSN)%'" |
There was a problem hiding this comment.
I'm not sure if we will find a way to convert this from .yaml to .php files. I think this mechanism should not be used for config/packages files and another mechanism would be better here.
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
force-pushed
the
bot-code-update
branch
from
6c6020a to
2faf5d8
Compare
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
force-pushed
the
bot-code-update
branch
from
2faf5d8 to
399a018
Compare
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
changed the title
symfony-php-recipes-bot
force-pushed
the
bot-code-update
branch
from
399a018 to
b2434db
Compare
alexander-schranz
approved these changes
Jul 19, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Symfony Recipes changed with version .
This PR contains the new definition for recipes.