Skip to content

Commit c0c48e0

Browse files
committed
ISSUE-337: test
1 parent a96c857 commit c0c48e0

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

composer.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@
4545
"symfony/yaml": "^4.4|^5.4",
4646
"doctrine/annotations": "*",
4747
"symfony/error-handler": "*",
48-
"symfony/serializer": "*"
48+
"symfony/serializer": "*",
49+
"monolog/monolog": "^2.0"
4950
},
5051
"require-dev": {
51-
"phpunit/phpunit": "^10.0",
52+
"phpunit/phpunit": "^9.5.2",
5253
"guzzlehttp/guzzle": "^6.3.0",
5354
"squizlabs/php_codesniffer": "^3.2.0",
5455
"phpstan/phpstan": "^0.7.0|0.12.57",
@@ -82,8 +83,8 @@
8283
"PhpList\\Core\\Composer\\ScriptHandler::createBundleConfiguration",
8384
"PhpList\\Core\\Composer\\ScriptHandler::createRoutesConfiguration",
8485
"PhpList\\Core\\Composer\\ScriptHandler::createParametersConfiguration",
85-
"php bin/console cache:clear --env=prod",
86-
"php bin/console cache:warmup --env=prod"
86+
"php bin/console cache:clear",
87+
"php bin/console cache:warmup"
8788
],
8889
"post-install-cmd": [
8990
"@update-configuration"
@@ -114,7 +115,7 @@
114115
"routes": {
115116
"homepage": {
116117
"resource": "@PhpListEmptyStartPageBundle/Controller/",
117-
"type": "annotation"
118+
"type": "attribute"
118119
}
119120
}
120121
}

config/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ framework:
3131
assets: ~
3232
php_errors:
3333
log: true
34+
serializer:
35+
enabled: true
3436

3537
# Doctrine Configuration
3638
doctrine:

config/parameters.yml.dist

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ parameters:
1414
database_host: '%%env(PHPLIST_DATABASE_HOST)%%'
1515
env(PHPLIST_DATABASE_HOST): '127.0.0.1'
1616
database_port: '%%env(PHPLIST_DATABASE_PORT)%%'
17-
env(PHPLIST_DATABASE_PORT): null
17+
env(PHPLIST_DATABASE_PORT): '3306'
1818
database_name: '%%env(PHPLIST_DATABASE_NAME)%%'
19-
env(PHPLIST_DATABASE_NAME): 'phplist'
19+
env(PHPLIST_DATABASE_NAME): 'phplistdb'
2020
database_user: '%%env(PHPLIST_DATABASE_USER)%%'
21-
env(PHPLIST_DATABASE_USER): 'foo'
21+
env(PHPLIST_DATABASE_USER): 'phplist'
2222
database_password: '%%env(PHPLIST_DATABASE_PASSWORD)%%'
23-
env(PHPLIST_DATABASE_PASSWORD): 'correct horse battery staple'
23+
env(PHPLIST_DATABASE_PASSWORD): 'phplist'
2424

2525
# A secret key that's used to generate certain security-related tokens
2626
secret: '%%env(PHPLIST_SECRET)%%'

src/Core/ApplicationStructure.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@ public function getApplicationRoot(): string
4242
{
4343
$corePackagePath = $this->getCorePackageRoot();
4444
$corePackageIsRootPackage = interface_exists('PhpList\\Core\\Tests\\Support\\Interfaces\\TestMarker');
45-
if (!$corePackageIsRootPackage) {
45+
if ($corePackageIsRootPackage) {
46+
$applicationRoot = $corePackagePath;
47+
} else {
4648
// remove 3 more path segments, i.e., "vendor/phplist/core/"
4749
$corePackagePath = dirname($corePackagePath, 3);
50+
$applicationRoot = $corePackagePath;
4851
}
49-
$applicationRoot = $corePackagePath;
5052

5153
if (!file_exists($applicationRoot . '/composer.json')) {
5254
throw new RuntimeException(

0 commit comments

Comments
 (0)