Skip to content

Commit 08b7c47

Browse files
weaverryanweaverryan
committed
Fixing <<<EOF syntax for php 7.1 and 7.2
1 parent d44e1e3 commit 08b7c47

File tree

3 files changed

+41
-41
lines changed

3 files changed

+41
-41
lines changed

‎tests/Configurator/ComposerScriptsConfiguratorTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public function testConfigure()
8686
}
8787
}
8888
89-
EOF,
90-
file_get_contents(FLEX_TEST_DIR.'/composer.json')
89+
EOF
90+
, file_get_contents(FLEX_TEST_DIR.'/composer.json')
9191
);
9292
}
9393

@@ -132,8 +132,8 @@ public function testUnconfigure()
132132
}
133133
}
134134
135-
EOF,
136-
file_get_contents(FLEX_TEST_DIR.'/composer.json')
135+
EOF
136+
, file_get_contents(FLEX_TEST_DIR.'/composer.json')
137137
);
138138
}
139139

‎tests/Update/DiffHelperTest.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ public function getRemoveFilesFromPatchTests(): iterable
105105
+ dbal:
106106
+ # "TEST_TOKEN" is typically set by ParaTest
107107
+ dbname_suffix: '_test%env(default::TEST_TOKEN)%'
108-
EOF,
109-
[
108+
EOF
109+
, [
110110
'.env' => <<<EOF
111111
diff --git a/.env b/.env
112112
index ea34452..daaeb63 100644
@@ -117,7 +117,7 @@ public function getRemoveFilesFromPatchTests(): iterable
117117
-# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
118118
-# For a PostgreSQL database, use: "postgresql://db_user:[email protected]:5432/db_name?serverVersion=11&charset=utf8"
119119
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
120-
EOF,
120+
EOF
121121
],
122122
];
123123

@@ -154,8 +154,8 @@ public function getRemoveFilesFromPatchTests(): iterable
154154
+ dbal:
155155
+ # "TEST_TOKEN" is typically set by ParaTest
156156
+ dbname_suffix: '_test%env(default::TEST_TOKEN)%'
157-
EOF,
158-
[
157+
EOF
158+
, [
159159
'config/packages/doctrine.yaml' => <<<EOF
160160
diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
161161
index 5e80e77..c319176 100644
@@ -204,8 +204,8 @@ public function getRemoveFilesFromPatchTests(): iterable
204204
- type: pool
205205
- pool: doctrine.system_cache_pool
206206
query_cache_driver:
207-
EOF,
208-
[
207+
EOF
208+
, [
209209
'config/packages/test/doctrine.yaml' => <<<EOF
210210
diff --git a/config/packages/test/doctrine.yaml b/config/packages/test/doctrine.yaml
211211
new file mode 100644
@@ -244,8 +244,8 @@ public function getRemoveFilesFromPatchTests(): iterable
244244
- type: pool
245245
- pool: doctrine.system_cache_pool
246246
query_cache_driver:
247-
EOF,
248-
[
247+
EOF
248+
, [
249249
'config/packages/test/doctrine.yaml' => <<<EOF
250250
diff --git a/config/packages/test/doctrine.yaml b/config/packages/test/doctrine.yaml
251251
new file mode 100644
@@ -257,8 +257,8 @@ public function getRemoveFilesFromPatchTests(): iterable
257257
+ dbal:
258258
+ # "TEST_TOKEN" is typically set by ParaTest
259259
+ dbname_suffix: '_test%env(default::TEST_TOKEN)%'
260-
EOF,
261-
'config/packages/doctrine.yaml' => <<<EOF
260+
EOF
261+
, 'config/packages/doctrine.yaml' => <<<EOF
262262
diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
263263
index 5e80e77..c319176 100644
264264
--- a/config/packages/doctrine.yaml
@@ -269,7 +269,7 @@ public function getRemoveFilesFromPatchTests(): iterable
269269
+ #server_version: '13'
270270
orm:
271271
auto_generate_proxy_classes: true
272-
EOF,
272+
EOF
273273
],
274274
];
275275

@@ -289,8 +289,8 @@ public function getRemoveFilesFromPatchTests(): iterable
289289
+ dbal:
290290
+ # "TEST_TOKEN" is typically set by ParaTest
291291
+ dbname_suffix: '_test%env(default::TEST_TOKEN)%'
292-
EOF,
293-
'config/packages/doctrine.yaml' => <<<EOF
292+
EOF
293+
, 'config/packages/doctrine.yaml' => <<<EOF
294294
diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
295295
index 5e80e77..c319176 100644
296296
--- a/config/packages/doctrine.yaml
@@ -301,8 +301,8 @@ public function getRemoveFilesFromPatchTests(): iterable
301301
+ #server_version: '13'
302302
orm:
303303
auto_generate_proxy_classes: true
304-
EOF,
305-
'.env' => <<<EOF
304+
EOF
305+
, '.env' => <<<EOF
306306
diff --git a/.env b/.env
307307
index ea34452..daaeb63 100644
308308
--- a/.env
@@ -312,8 +312,8 @@ public function getRemoveFilesFromPatchTests(): iterable
312312
-# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
313313
-# For a PostgreSQL database, use: "postgresql://db_user:[email protected]:5432/db_name?serverVersion=11&charset=utf8"
314314
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
315-
EOF,
316-
'config/packages/prod/doctrine.yaml' => <<<EOF
315+
EOF
316+
, 'config/packages/prod/doctrine.yaml' => <<<EOF
317317
diff --git a/config/packages/prod/doctrine.yaml b/config/packages/prod/doctrine.yaml
318318
index 8ae31a3..17299e2 100644
319319
--- a/config/packages/prod/doctrine.yaml
@@ -324,7 +324,7 @@ public function getRemoveFilesFromPatchTests(): iterable
324324
- type: pool
325325
- pool: doctrine.system_cache_pool
326326
query_cache_driver:
327-
EOF,
327+
EOF
328328
],
329329
];
330330
}

‎tests/Update/RecipePatcherTest.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,8 @@ private function getFilesForPatching(): array
401401
# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
402402
DATABASE_URL=sqlite:///%kernel.project_dir%/var/data.db
403403
###< doctrine/doctrine-bundle ###
404-
EOF,
405-
'updated_recipe' => <<<EOF
404+
EOF
405+
, 'updated_recipe' => <<<EOF
406406
###> symfony/framework-bundle ###
407407
APP_ENV=dev
408408
APP_SECRET=cd0019c56963e76bacd77eee67e1b222
@@ -413,8 +413,8 @@ private function getFilesForPatching(): array
413413
# For an SQL-HEAVY database, use: "sqlheavy:///%kernel.project_dir%/var/data.db"
414414
DATABASE_URL=sqlite:///%kernel.project_dir%/var/data.db
415415
###< doctrine/doctrine-bundle ###
416-
EOF,
417-
'in_app' => <<<EOF
416+
EOF
417+
, 'in_app' => <<<EOF
418418
###> symfony/framework-bundle ###
419419
APP_ENV=CHANGED_TO_PROD_ENVIRONMENT
420420
APP_SECRET=cd0019c56963e76bacd77eee67e1b222
@@ -425,8 +425,8 @@ private function getFilesForPatching(): array
425425
# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
426426
DATABASE_URL=sqlite:///%kernel.project_dir%/var/data.db
427427
###< doctrine/doctrine-bundle ###
428-
EOF,
429-
'expected' => <<<EOF
428+
EOF
429+
, 'expected' => <<<EOF
430430
###> symfony/framework-bundle ###
431431
APP_ENV=CHANGED_TO_PROD_ENVIRONMENT
432432
APP_SECRET=cd0019c56963e76bacd77eee67e1b222
@@ -451,26 +451,26 @@ private function getFilesForPatching(): array
451451
"@symfony/webpack-encore": "^1.4.0"
452452
}
453453
}
454-
EOF,
455-
'updated_recipe' => <<<EOF
454+
EOF
455+
, 'updated_recipe' => <<<EOF
456456
{
457457
"devDependencies": {
458458
"@hotwired/stimulus": "^3.0.0",
459459
"@symfony/stimulus-bridge": "^3.0.0",
460460
"@symfony/webpack-encore": "^1.7.0"
461461
}
462462
}
463-
EOF,
464-
'in_app' => <<<EOF
463+
EOF
464+
, 'in_app' => <<<EOF
465465
{
466466
"devDependencies": {
467467
"@hotwired/stimulus": "^2.1.0",
468468
"@symfony/stimulus-bridge": "^3.0.0",
469469
"@symfony/webpack-encore": "^1.4.0"
470470
}
471471
}
472-
EOF,
473-
'expected' => <<<EOF
472+
EOF
473+
, 'expected' => <<<EOF
474474
{
475475
"devDependencies": {
476476
<<<<<<< ours
@@ -495,8 +495,8 @@ private function getFilesForPatching(): array
495495
output_path: '%kernel.project_dir%/public/build'
496496
# If multiple builds are defined (as shown below), you can disable the default build:
497497
# output_path: false
498-
EOF,
499-
'in_app' => null,
498+
EOF
499+
, 'in_app' => null,
500500
'expected' => <<<EOF
501501
webpack_encore:
502502
# The path where Encore is building the assets - i.e. Encore.setOutputPath()
@@ -513,14 +513,14 @@ private function getFilesForPatching(): array
513513
security:
514514
password_hashers:
515515
Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
516-
EOF,
517-
'updated_recipe' => null,
516+
EOF
517+
, 'updated_recipe' => null,
518518
'in_app' => <<<EOF
519519
security:
520520
password_hashers:
521521
Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
522-
EOF,
523-
'expected' => null,
522+
EOF
523+
, 'expected' => null,
524524
],
525525
];
526526

0 commit comments

Comments
 (0)