Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e3ca516

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.5
* 2.3: [2.3] fix failing test fixed typo Escape annotations in comments, refs #13089. [2.3] missing cleanup for legacy test add missing param names to @param annotation Improve the composer root version setting on Travis
2 parents e11f8b4 + 1201853 commit e3ca516

File tree

5 files changed

+18
-41
lines changed

5 files changed

+18
-41
lines changed

‎.travis.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ language: php
22

33
matrix:
44
include:
5-
- php: 5.3.3
6-
env: components=low
7-
- php: 5.6
8-
env: components=high
95
- php: 5.3.3
106
- php: 5.3
117
- php: 5.4
128
- php: 5.5
139
- php: 5.6
10+
- php: 5.3.3
11+
env: components=low
12+
- php: 5.6
13+
env: components=high
1414
- php: hhvm-nightly
1515
allow_failures:
1616
- php: hhvm-nightly
@@ -32,13 +32,14 @@ before_install:
3232
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
3333
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then php -i; fi;
3434
- sudo locale-gen fr_FR.UTF-8 && sudo update-locale
35-
# - if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi;
35+
# Set the COMPOSER_ROOT_VERSION to the right version according to the branch being built
36+
- if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION="$TRAVIS_BRANCH".x-dev; fi;
3637

3738
install:
38-
- if [ "$components" = "no" ]; then COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; fi;
39+
- if [ "$components" = "no" ]; then composer --prefer-source --dev install; fi;
3940

4041
script:
4142
- if [ "$components" = "no" ]; then ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; phpunit --exclude-group tty,benchmark,intl-data {} || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
4243
- if [ "$components" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi;
43-
- if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
44-
- if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
44+
- if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --dev update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
45+
- if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --dev --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;

‎src/Symfony/Component/HttpKernel/Kernel.php

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -240,35 +240,9 @@ public function getBundle($name, $first = true)
240240
}
241241

242242
/**
243-
* Returns the file path for a given resource.
243+
* {@inheritDoc}
244244
*
245-
* A Resource can be a file or a directory.
246-
*
247-
* The resource name must follow the following pattern:
248-
*
249-
* @<BundleName>/path/to/a/file.something
250-
*
251-
* where BundleName is the name of the bundle
252-
* and the remaining part is the relative path in the bundle.
253-
*
254-
* If $dir is passed, and the first segment of the path is "Resources",
255-
* this method will look for a file named:
256-
*
257-
* $dir/<BundleName>/path/without/Resources
258-
*
259-
* before looking in the bundle resource folder.
260-
*
261-
* @param string $name A resource name to locate
262-
* @param string $dir A directory where to look for the resource first
263-
* @param bool $first Whether to return the first path or paths for all matching bundles
264-
*
265-
* @return string|array The absolute path of the resource or an array if $first is false
266-
*
267-
* @throws \InvalidArgumentException if the file cannot be found or the name is not valid
268-
* @throws \RuntimeException if the name contains invalid/unsafe
269-
* @throws \RuntimeException if a custom resource is hidden by a resource in a derived bundle
270-
*
271-
* @api
245+
* @throws \RuntimeException if a custom resource is hidden by a resource in a derived bundle
272246
*/
273247
public function locateResource($name, $dir = null, $first = true)
274248
{

‎src/Symfony/Component/HttpKernel/KernelInterface.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,17 @@ public function getBundle($name, $first = true);
101101
*
102102
* The resource name must follow the following pattern:
103103
*
104-
* @BundleName/path/to/a/file.something
104+
* "@BundleName/path/to/a/file.something"
105105
*
106106
* where BundleName is the name of the bundle
107107
* and the remaining part is the relative path in the bundle.
108108
*
109-
* If $dir is passed, and the first segment of the path is Resources,
109+
* If $dir is passed, and the first segment of the path is "Resources",
110110
* this method will look for a file named:
111111
*
112-
* $dir/BundleName/path/without/Resources
112+
* $dir/<BundleName>/path/without/Resources
113+
*
114+
* before looking in the bundle resource folder.
113115
*
114116
* @param string $name A resource name to locate
115117
* @param string $dir A directory where to look for the resource first

‎src/Symfony/Component/Process/ProcessBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public function setInput($input)
187187
*
188188
* To disable the timeout, set this value to null.
189189
*
190-
* @param float|null
190+
* @param float|null $timeout
191191
*
192192
* @return ProcessBuilder
193193
*

‎src/Symfony/Component/Security/Core/Util/ClassUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private function __construct()
4848
/**
4949
* Gets the real class name of a class name that could be a proxy.
5050
*
51-
* @param string|object
51+
* @param string|object $object
5252
*
5353
* @return string
5454
*/

0 commit comments

Comments
 (0)