Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2e11b8b

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8'
* 2.8: Fix merge [tests] Use @requires annotation when possible [tests] Use @requires annotation when possible [PhpUnitBridge] Add SkippedTestsListener to collect and replay skipped tests [ci] Enable collecting and replaying skipped tests [tests] Use @requires annotation when possible [Process] Workaround buggy PHP warning [FrameworkBundle] Replace PhpFileCache by FilesystemCache [FrameworkBundle] composer suggest fix [Console] Add additional ways to detect OS400 platform [Yaml] Allow tabs before comments at the end of a line Added more tests for PropertyAccess Conflicts: .travis.yml src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Bridge/Monolog/composer.json src/Symfony/Bridge/ProxyManager/composer.json src/Symfony/Bridge/Swiftmailer/composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/DebugBundle/composer.json src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Bundle/WebProfilerBundle/composer.json src/Symfony/Component/Asset/composer.json src/Symfony/Component/BrowserKit/composer.json src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php src/Symfony/Component/ClassLoader/composer.json src/Symfony/Component/Config/composer.json src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php src/Symfony/Component/Console/composer.json src/Symfony/Component/CssSelector/composer.json src/Symfony/Component/Debug/composer.json src/Symfony/Component/DependencyInjection/composer.json src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/ExpressionLanguage/composer.json src/Symfony/Component/Filesystem/composer.json src/Symfony/Component/Finder/composer.json src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php src/Symfony/Component/Form/composer.json src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php src/Symfony/Component/HttpKernel/Tests/Profiler/SqliteProfilerStorageTest.php src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php src/Symfony/Component/Intl/composer.json src/Symfony/Component/Ldap/composer.json src/Symfony/Component/Locale/composer.json src/Symfony/Component/Locale/phpunit.xml.dist src/Symfony/Component/OptionsResolver/composer.json src/Symfony/Component/Process/composer.json src/Symfony/Component/PropertyAccess/composer.json src/Symfony/Component/PropertyInfo/composer.json src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Csrf/composer.json src/Symfony/Component/Security/Guard/composer.json src/Symfony/Component/Security/Http/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/composer.json src/Symfony/Component/Stopwatch/composer.json src/Symfony/Component/Templating/composer.json src/Symfony/Component/Translation/composer.json src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php src/Symfony/Component/Validator/composer.json src/Symfony/Component/VarDumper/composer.json src/Symfony/Component/Yaml/composer.json
2 parents dc4a7df + c8475c9 commit 2e11b8b
Copy full SHA for 2e11b8b

File tree

Expand file treeCollapse file tree

151 files changed

+441
-394
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

151 files changed

+441
-394
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ install:
4848
- if [ "$deps" = "2.8" ]; then git fetch origin 2.8; git checkout -m FETCH_HEAD; export COMPOSER_ROOT_VERSION=2.8.x-dev; fi;
4949

5050
script:
51-
- if [ "$deps" = "no" ]; then echo "$COMPONENTS" | parallel --gnu 'echo -e "\\nRunning {} tests"; $PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi;
51+
- if [ "$deps" = "no" ]; then echo "$COMPONENTS" | parallel --gnu '$PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi;
5252
- if [ "$deps" = "no" ]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi;
53-
- if [ "$deps" = "high" ]; then echo "$COMPONENTS" | parallel --gnu -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi;
54-
- if [ "$deps" = "low" ]; then echo "$COMPONENTS" | parallel --gnu -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi;
55-
- if [ "$deps" = "2.8" ]; then echo "$COMPONENTS" | parallel --gnu -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; $PHPUNIT --exclude-group tty,benchmark,intl-data,legacy'; fi;
53+
- if [ "$deps" = "high" ]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer --prefer-source update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi;
54+
- if [ "$deps" = "low" ]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi;
55+
- if [ "$deps" = "2.8" ]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer --prefer-source update; $PHPUNIT --exclude-group tty,benchmark,intl-data,legacy'; fi;
5656
- if [ "$deps" = "skip" ]; then echo 'This matrix line is skipped for pull requests.'; fi;

‎appveyor.yml

Copy file name to clipboardExpand all lines: appveyor.yml
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ init:
1414
- SET PHP=1
1515
- SET ANSICON=121x90 (121x90)
1616
- SET PHP_INI_MATRIX=php.ini-min php.ini-max
17+
- SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
1718

1819
install:
1920
- IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
@@ -22,6 +23,7 @@ install:
2223
- IF %PHP%==1 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y > 7z.log
2324
- IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
2425
- IF %PHP%==1 copy /Y php.ini-development php.ini-min
26+
- IF %PHP%==1 echo max_execution_time=1200 >> php.ini-min
2527
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini-min
2628
- IF %PHP%==1 echo extension_dir=ext >> php.ini-min
2729
- IF %PHP%==1 echo extension=php_openssl.dll >> php.ini-min

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
"symfony/yaml": "2.99.99"
7070
},
7171
"require-dev": {
72-
"symfony/phpunit-bridge": "self.version",
7372
"doctrine/data-fixtures": "1.0.*",
7473
"doctrine/dbal": "~2.4",
7574
"doctrine/orm": "~2.4,>=2.4.5",

‎phpunit

Copy file name to clipboardExpand all lines: phpunit
+14-2Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit")) {
2828
// Build a standalone phpunit without symfony/yaml
2929

3030
$oldPwd = getcwd();
31-
mkdir($PHPUNIT_DIR);
31+
@mkdir($PHPUNIT_DIR);
3232
chdir($PHPUNIT_DIR);
3333
if (extension_loaded('openssl') && ini_get('allow_url_fopen')) {
3434
stream_copy_to_stream(fopen("https://github.com/sebastianbergmann/phpunit/archive/$PHPUNIT_VERSION.zip", 'rb'), fopen("$PHPUNIT_VERSION.zip", 'wb'));
@@ -41,6 +41,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit")) {
4141
$zip->close();
4242
chdir("phpunit-$PHPUNIT_VERSION");
4343
passthru("$COMPOSER remove --no-update symfony/yaml");
44+
passthru("$COMPOSER require --dev --no-update symfony/phpunit-bridge \">=2.8@dev\"");
4445
passthru("$COMPOSER install --prefer-source --no-progress --ansi");
4546
chdir($oldPwd);
4647
}
@@ -76,10 +77,13 @@ if ($phpIniMatrix) {
7677
if (isset($argv[1]) && 'symfony' === $argv[1]) {
7778
// Find Symfony components in plain php for Windows portability
7879

79-
$finder = new RecursiveDirectoryIterator(__DIR__.'/src/Symfony', FilesystemIterator::KEY_AS_FILENAME | FilesystemIterator::UNIX_PATHS);
80+
$oldPwd = getcwd();
81+
chdir(__DIR__);
82+
$finder = new RecursiveDirectoryIterator('src/Symfony', FilesystemIterator::KEY_AS_FILENAME | FilesystemIterator::UNIX_PATHS);
8083
$finder = new RecursiveIteratorIterator($finder);
8184
$finder->setMaxDepth(3);
8285

86+
$skippedTests = isset($_SERVER['SYMFONY_PHPUNIT_SKIPPED_TESTS']) ? $_SERVER['SYMFONY_PHPUNIT_SKIPPED_TESTS'] : false;
8387
$runningProcs = array();
8488

8589
foreach ($finder as $file => $fileInfo) {
@@ -88,6 +92,10 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) {
8892

8993
// Run phpunit tests in parallel
9094

95+
if ($skippedTests) {
96+
putenv("SYMFONY_PHPUNIT_SKIPPED_TESTS=$component/$skippedTests");
97+
}
98+
9199
$c = ProcessUtils::escapeArgument($component);
92100

93101
if ($proc = proc_open(sprintf($cmd, $c, " > $c/phpunit.stdout 2> $c/phpunit.stderr"), array(), $pipes)) {
@@ -98,6 +106,7 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) {
98106
}
99107
}
100108
}
109+
chdir($oldPwd);
101110

102111
// Fixes for colors support on appveyor
103112
// See https://github.com/appveyor/ci/issues/373
@@ -139,6 +148,9 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) {
139148
}
140149
unlink($file);
141150
}
151+
if ($skippedTests) {
152+
@unlink("$component/$skippedTests");
153+
}
142154

143155
if ($procStatus) {
144156
$exit = 1;

‎phpunit.xml.dist

Copy file name to clipboardExpand all lines: phpunit.xml.dist
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,8 @@
4343
</exclude>
4444
</whitelist>
4545
</filter>
46+
47+
<listeners>
48+
<listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
49+
</listeners>
4650
</phpunit>

‎src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ class DoctrineTestHelper
2929
*/
3030
public static function createTestEntityManager()
3131
{
32-
if (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers())) {
33-
\PHPUnit_Framework_TestCase::markTestSkipped('This test requires SQLite support in your environment');
32+
if (!extension_loaded('pdo_sqlite')) {
33+
\PHPUnit_Framework_TestCase::markTestSkipped('Extension pdo_sqlite is required.');
3434
}
3535

3636
$config = new \Doctrine\ORM\Configuration();

‎src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
+3-4Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,11 @@ public function testLogLongString()
132132
));
133133
}
134134

135+
/**
136+
* @requires extension mbstring
137+
*/
135138
public function testLogUTF8LongString()
136139
{
137-
if (!function_exists('mb_detect_encoding')) {
138-
$this->markTestSkipped('Testing log shortening of utf8 charsets requires the mb_detect_encoding() function.');
139-
}
140-
141140
$logger = $this->getMock('Psr\\Log\\LoggerInterface');
142141

143142
$dbalLogger = $this

‎src/Symfony/Bridge/Doctrine/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/composer.json
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"doctrine/common": "~2.4"
2121
},
2222
"require-dev": {
23-
"symfony/phpunit-bridge": "~2.8|~3.0",
2423
"symfony/stopwatch": "~2.8|~3.0",
2524
"symfony/dependency-injection": "~2.8|~3.0",
2625
"symfony/form": "~2.8|~3.0",

‎src/Symfony/Bridge/Doctrine/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/phpunit.xml.dist
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,8 @@
2525
</exclude>
2626
</whitelist>
2727
</filter>
28+
29+
<listeners>
30+
<listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
31+
</listeners>
2832
</phpunit>

‎src/Symfony/Bridge/Monolog/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/composer.json
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"monolog/monolog": "~1.11"
2121
},
2222
"require-dev": {
23-
"symfony/phpunit-bridge": "~2.8|~3.0",
2423
"symfony/http-kernel": "~2.8|~3.0",
2524
"symfony/console": "~2.8|~3.0",
2625
"symfony/event-dispatcher": "~2.8|~3.0"

‎src/Symfony/Bridge/Monolog/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/phpunit.xml.dist
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,8 @@
2525
</exclude>
2626
</whitelist>
2727
</filter>
28+
29+
<listeners>
30+
<listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
31+
</listeners>
2832
</phpunit>

‎src/Symfony/Bridge/PhpUnit/SkippedTestsListener.php

Copy file name to clipboard
+85Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bridge\PhpUnit;
13+
14+
use Doctrine\Common\Annotations\AnnotationRegistry;
15+
16+
/**
17+
* Collects and replays skipped tests.
18+
*
19+
* @author Nicolas Grekas <p@tchwork.com>
20+
*/
21+
class SkippedTestsListener extends \PHPUnit_Framework_BaseTestListener
22+
{
23+
private $state = -1;
24+
private $skippedFile = false;
25+
private $wasSkipped = array();
26+
private $isSkipped = array();
27+
28+
public function __destruct()
29+
{
30+
if (0 < $this->state) {
31+
file_put_contents($this->skippedFile, '<?php return '.var_export($this->isSkipped, true).';');
32+
}
33+
}
34+
35+
public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
36+
{
37+
$suiteName = $suite->getName();
38+
39+
if (-1 === $this->state) {
40+
echo "Testing $suiteName\n";
41+
$this->state = 0;
42+
43+
if (!class_exists('Doctrine\Common\Annotations\AnnotationRegistry', false) && class_exists('Doctrine\Common\Annotations\AnnotationRegistry')) {
44+
AnnotationRegistry::registerLoader('class_exists');
45+
}
46+
47+
if ($this->skippedFile = getenv('SYMFONY_PHPUNIT_SKIPPED_TESTS')) {
48+
$this->state = 1;
49+
50+
if (file_exists($this->skippedFile)) {
51+
$this->state = 2;
52+
53+
if (!$this->wasSkipped = require $this->skippedFile) {
54+
exit("All tests already ran successfully.\n");
55+
}
56+
}
57+
}
58+
} elseif (2 === $this->state) {
59+
$skipped = array();
60+
foreach ($suite->tests() as $test) {
61+
if (!$test instanceof \PHPUnit_Framework_TestCase
62+
|| isset($this->wasSkipped[$suiteName]['*'])
63+
|| isset($this->wasSkipped[$suiteName][$test->getName()])) {
64+
$skipped[] = $test;
65+
}
66+
}
67+
$suite->setTests($skipped);
68+
}
69+
}
70+
71+
public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
72+
{
73+
if (0 < $this->state) {
74+
if ($test instanceof \PHPUnit_Framework_TestCase) {
75+
$class = get_class($test);
76+
$method = $test->getName();
77+
} else {
78+
$class = $test->getName();
79+
$method = '*';
80+
}
81+
82+
$this->isSkipped[$class][$method] = 1;
83+
}
84+
}
85+
}

‎src/Symfony/Bridge/PhpUnit/bootstrap.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/bootstrap.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// Enforce a consistent locale
2525
setlocale(LC_ALL, 'C');
2626

27-
if (class_exists('Doctrine\Common\Annotations\AnnotationRegistry')) {
27+
if (!class_exists('Doctrine\Common\Annotations\AnnotationRegistry', false) && class_exists('Doctrine\Common\Annotations\AnnotationRegistry')) {
2828
AnnotationRegistry::registerLoader('class_exists');
2929
}
3030

‎src/Symfony/Bridge/ProxyManager/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/ProxyManager/composer.json
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"ocramius/proxy-manager": "~0.4|~1.0"
2222
},
2323
"require-dev": {
24-
"symfony/phpunit-bridge": "~2.8|~3.0",
2524
"symfony/config": "~2.8|~3.0"
2625
},
2726
"autoload": {

‎src/Symfony/Bridge/ProxyManager/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/ProxyManager/phpunit.xml.dist
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,8 @@
2626
</exclude>
2727
</whitelist>
2828
</filter>
29+
30+
<listeners>
31+
<listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
32+
</listeners>
2933
</phpunit>

‎src/Symfony/Bridge/Twig/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/composer.json
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"twig/twig": "~1.20|~2.0"
2121
},
2222
"require-dev": {
23-
"symfony/phpunit-bridge": "~2.8|~3.0",
2423
"symfony/asset": "~2.8|~3.0",
2524
"symfony/finder": "~2.8|~3.0",
2625
"symfony/form": "~2.8|~3.0",

‎src/Symfony/Bridge/Twig/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/phpunit.xml.dist
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,8 @@
2626
</exclude>
2727
</whitelist>
2828
</filter>
29+
30+
<listeners>
31+
<listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
32+
</listeners>
2933
</phpunit>

‎src/Symfony/Bundle/DebugBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/DebugBundle/composer.json
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"symfony/var-dumper": "~2.8|~3.0"
2323
},
2424
"require-dev": {
25-
"symfony/phpunit-bridge": "~2.8|~3.0",
2625
"symfony/config": "~2.8|~3.0",
2726
"symfony/dependency-injection": "~2.8|~3.0",
2827
"symfony/web-profiler-bundle": "~2.8|~3.0"

‎src/Symfony/Bundle/DebugBundle/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,8 @@
2626
</exclude>
2727
</whitelist>
2828
</filter>
29+
30+
<listeners>
31+
<listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
32+
</listeners>
2933
</phpunit>

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,14 +815,14 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
815815
}
816816

817817
$container
818-
->getDefinition('annotations.php_file_cache')
818+
->getDefinition('annotations.filesystem_cache')
819819
->replaceArgument(0, $cacheDir)
820820
;
821821
}
822822

823823
$container
824824
->getDefinition('annotations.cached_reader')
825-
->replaceArgument(1, new Reference('file' !== $config['cache'] ? $config['cache'] : 'annotations.php_file_cache'))
825+
->replaceArgument(1, new Reference('file' !== $config['cache'] ? $config['cache'] : 'annotations.filesystem_cache'))
826826
->replaceArgument(2, $config['debug'])
827827
;
828828
$container->setAlias('annotation_reader', 'annotations.cached_reader');

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<argument /><!-- Debug-Flag -->
1414
</service>
1515

16-
<service id="annotations.php_file_cache" class="Doctrine\Common\Cache\PhpFileCache" public="false">
16+
<service id="annotations.filesystem_cache" class="Doctrine\Common\Cache\FilesystemCache" public="false">
1717
<argument /><!-- Cache-Directory -->
1818
</service>
1919

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,9 @@ public function testAnnotations()
312312
{
313313
$container = $this->createContainerFromFile('full');
314314

315-
$this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.php_file_cache')->getArgument(0));
315+
$this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.filesystem_cache')->getArgument(0));
316316
$this->assertSame('annotations.cached_reader', (string) $container->getAlias('annotation_reader'));
317-
$this->assertSame('annotations.php_file_cache', (string) $container->getDefinition('annotations.cached_reader')->getArgument(1));
317+
$this->assertSame('annotations.filesystem_cache', (string) $container->getDefinition('annotations.cached_reader')->getArgument(1));
318318
}
319319

320320
public function testFileLinkFormat()

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/composer.json
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"doctrine/annotations": "~1.0"
3535
},
3636
"require-dev": {
37-
"symfony/phpunit-bridge": "~2.8|~3.0",
3837
"symfony/browser-kit": "~2.8|~3.0",
3938
"symfony/console": "~2.8|~3.0",
4039
"symfony/css-selector": "~2.8|~3.0",
@@ -55,8 +54,7 @@
5554
"symfony/form": "For using forms",
5655
"symfony/serializer": "For using the serializer service",
5756
"symfony/validator": "For using validation",
58-
"symfony/yaml": "For using the debug:config and lint:yaml commands",
59-
"doctrine/cache": "For using alternative cache drivers"
57+
"symfony/yaml": "For using the debug:config and lint:yaml commands"
6058
},
6159
"autoload": {
6260
"psr-4": { "Symfony\\Bundle\\FrameworkBundle\\": "" }

‎src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,8 @@
2626
</exclude>
2727
</whitelist>
2828
</filter>
29+
30+
<listeners>
31+
<listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
32+
</listeners>
2933
</phpunit>

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
* Tests SetAclCommand.
3434
*
3535
* @author Kévin Dunglas <kevin@les-tilleuls.coop>
36+
* @requires extension pdo_sqlite
3637
*/
3738
class SetAclCommandTest extends WebTestCase
3839
{
@@ -41,9 +42,6 @@ class SetAclCommandTest extends WebTestCase
4142

4243
protected function setUp()
4344
{
44-
if (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers())) {
45-
self::markTestSkipped('This test requires SQLite support in your environment');
46-
}
4745
parent::setUp();
4846

4947
$this->deleteTmpDir('Acl');

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.