Skip to content

Commit 6bf2dd9

Browse files
nicolas-grekasnicolas-grekas
committed
minor #33637 install from source to include components tests (xabbuh)
This PR was squashed before being merged into the 3.4 branch (closes #33637). Discussion ---------- install from source to include components tests | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- 5aa4328 Revert "bug #33618 fix tests depending on other components' tests (xabbuh)" c792908 install from source to include components tests
2 parents 47fb090 + 5aa4328 commit 6bf2dd9

File tree

16 files changed

+607
-657
lines changed

16 files changed

+607
-657
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,12 +294,12 @@ install:
294294
tfold 'phpunit install' ./phpunit install
295295
fi
296296
if [[ $deps = high ]]; then
297-
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
297+
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP --prefer-source && $PHPUNIT_X$LEGACY'"
298298
elif [[ $deps = low ]]; then
299299
[[ -e ~/php-ext/composer-lowest.lock.tar ]] && tar -xf ~/php-ext/composer-lowest.lock.tar
300300
tar -cf ~/php-ext/composer-lowest.lock.tar --files-from /dev/null
301301
php .github/rm-invalid-lowest-lock-files.php $COMPONENTS
302-
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable) && $PHPUNIT_X'"
302+
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable --prefer-source) && $PHPUNIT_X'"
303303
echo "$COMPONENTS" | xargs -n1 -I{} tar --append -f ~/php-ext/composer-lowest.lock.tar {}/composer.lock
304304
elif [[ $PHP = hhvm* ]]; then
305305
rm src/Symfony/Bridge/PhpUnit -Rf

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"doctrine/annotations": "~1.7",
2626
"symfony/stopwatch": "~2.8|~3.0|~4.0",
2727
"symfony/dependency-injection": "~3.4|~4.0",
28-
"symfony/form": "^3.4.32|^4.3.5",
28+
"symfony/form": "^3.3.10|~4.0",
2929
"symfony/http-kernel": "~2.8|~3.0|~4.0",
3030
"symfony/property-access": "~2.8|~3.0|~4.0",
3131
"symfony/property-info": "~2.8|3.0|~4.0",

‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
2121
use Symfony\Component\DependencyInjection\ContainerInterface;
2222
use Symfony\Component\HttpFoundation\Request;
23-
use Symfony\Component\HttpKernel\Test\Controller\ContainerControllerResolverTestCase;
23+
use Symfony\Component\HttpKernel\Tests\Controller\ContainerControllerResolverTest;
2424

25-
class ControllerResolverTest extends ContainerControllerResolverTestCase
25+
class ControllerResolverTest extends ContainerControllerResolverTest
2626
{
2727
public function testGetControllerOnContainerAware()
2828
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"symfony/debug": "~2.8|~3.0|~4.0",
2626
"symfony/event-dispatcher": "~3.4|~4.0",
2727
"symfony/http-foundation": "^3.4.13|~4.3",
28-
"symfony/http-kernel": "^3.4.32|^4.3.5",
28+
"symfony/http-kernel": "^3.4.31|^4.3.4",
2929
"symfony/polyfill-mbstring": "~1.0",
3030
"symfony/filesystem": "~2.8|~3.0|~4.0",
3131
"symfony/finder": "~2.8|~3.0|~4.0",

‎src/Symfony/Component/Form/Test/FormPerformanceTestCase.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace Symfony\Component\Form\Test;
1313

14+
use Symfony\Component\Form\Tests\VersionAwareTest;
15+
1416
/**
1517
* Base class for performance tests.
1618
*

‎src/Symfony/Component/Form/Tests/AbstractLayoutTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Component\Form\FormError;
1616
use Symfony\Component\Form\FormView;
1717
use Symfony\Component\Form\Test\FormIntegrationTestCase;
18-
use Symfony\Component\Form\Test\VersionAwareTest;
1918

2019
abstract class AbstractLayoutTest extends FormIntegrationTestCase
2120
{

‎src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

1414
use Symfony\Component\Form\Test\TypeTestCase;
15-
use Symfony\Component\Form\Test\VersionAwareTest;
15+
use Symfony\Component\Form\Tests\VersionAwareTest;
1616

1717
/**
1818
* @author Bernhard Schussek <bschussek@gmail.com>

‎src/Symfony/Component/Form/Test/VersionAwareTest.php renamed to ‎src/Symfony/Component/Form/Tests/VersionAwareTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Form\Test;
12+
namespace Symfony\Component\Form\Tests;
1313

14-
/**
15-
* @internal
16-
*/
1714
trait VersionAwareTest
1815
{
1916
protected static $supportedFeatureSetVersion = 304;

‎src/Symfony/Component/HttpKernel/Test/Controller/ContainerControllerResolverTestCase.php

Lines changed: 0 additions & 301 deletions
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy