Skip to content

Commit 201d0e0

Browse files
committed
minor #441 Fix tests (weaverryan)
This PR was squashed before being merged into the 1.0-dev branch (closes #441). Discussion ---------- Fix tests Tests are a bit broken after some upstream changes and some tweaks to the matrix. I'd like to stabilize them before 1.12. Commits ------- f4561c0 removing allow_failures and not testing lowest for now 6a23426 playing with windows commands 5ac989b Fixing cs 0be971b removing global flex install
2 parents 5db6531 + f4561c0 commit 201d0e0

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

.travis.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ matrix:
2020
env: MAKER_TEST_VERSION=stable-dev
2121
- php: 7.1
2222
env: MAKER_TEST_VERSION=dev
23-
- php: 7.1
24-
env: deps=low
2523

26-
allow_failures:
27-
# Dev-master is allowed to fail.
28-
- env: STABILITY="dev"
24+
# the following need to be refactored properly into allow_failures
25+
# allow_failures:
26+
# # low deps is still a WIP
27+
# - php: 7.1
28+
# env: deps=low
29+
# # Dev-master is allowed to fail.
30+
# - env: STABILITY="dev"
2931

3032
before_install:
3133
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;
@@ -37,12 +39,6 @@ before_install:
3739
fi
3840
3941
install:
40-
- |
41-
# Install symfony/flex
42-
if [[ $deps = low ]]; then
43-
export SYMFONY_REQUIRE='>=3.4'
44-
fi
45-
composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
4642
- ./vendor/bin/simple-phpunit install
4743

4844
script:

src/Maker/MakeUser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
160160

161161
// C) Generate a custom user provider, if necessary
162162
if (!$userClassConfiguration->isEntity()) {
163-
$userClassConfiguration->setUserProviderClass($generator->getRootNamespace() . '\\Security\\UserProvider');
163+
$userClassConfiguration->setUserProviderClass($generator->getRootNamespace().'\\Security\\UserProvider');
164164
$customProviderPath = $generator->generateClass(
165165
$userClassConfiguration->getUserProviderClass(),
166166
'security/UserProvider.tpl.php',

src/Test/MakerTestEnvironment.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public function prepare()
129129
try {
130130
// lets do some magic here git is faster than copy
131131
MakerTestProcess::create(
132-
'git clone "$FLEX_PATH" "$APP_PATH"',
132+
'\\' === \DIRECTORY_SEPARATOR ? 'git clone %FLEX_PATH% %APP_PATH%' : 'git clone "$FLEX_PATH" "$APP_PATH"',
133133
\dirname($this->flexPath),
134134
[
135135
'FLEX_PATH' => $this->flexPath,

0 commit comments

Comments
 (0)