Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
/Configuration/parameters.yml
/Configuration/routing_modules.yml
/nbproject
/public/
/var/
/vendor/
/web/
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
- REST action for getting all subscribers for a list (#83)

### Changed
- Adopt more of the default Symfony project structure (#92, #93, #94)
- Adopt more of the default Symfony project structure (#92, #93, #94, #95)

### Deprecated

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"symfony-app-dir": "bin",
"symfony-bin-dir": "bin",
"symfony-var-dir": "var",
"symfony-web-dir": "web",
"symfony-web-dir": "public",
"symfony-tests-dir": "tests",
"phplist/phplist4-core": {
"bundles": [
Expand Down
16 changes: 8 additions & 8 deletions tests/Integration/Composer/ScriptsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ class ScriptsTest extends TestCase
/**
* @test
*/
public function webDirectoryHasBeenCreated()
public function publicDirectoryHasBeenCreated()
{
static::assertDirectoryExists($this->getAbsoluteWebDirectoryPath());
static::assertDirectoryExists($this->getAbsolutePublicDirectoryPath());
}

/**
* @return string
*/
private function getAbsoluteWebDirectoryPath(): string
private function getAbsolutePublicDirectoryPath(): string
{
return dirname(__DIR__, 3) . '/web/';
return dirname(__DIR__, 3) . '/public/';
}

/**
* @return string[][]
*/
public function webDirectoryFilesDataProvider(): array
public function publicDirectoryFilesDataProvider(): array
{
return [
'production entry point' => ['app.php'],
Expand All @@ -44,11 +44,11 @@ public function webDirectoryFilesDataProvider(): array
/**
* @test
* @param string $fileName
* @dataProvider webDirectoryFilesDataProvider
* @dataProvider publicDirectoryFilesDataProvider
*/
public function webDirectoryFilesExist(string $fileName)
public function publicDirectoryFilesExist(string $fileName)
{
static::assertFileExists($this->getAbsoluteWebDirectoryPath() . $fileName);
static::assertFileExists($this->getAbsolutePublicDirectoryPath() . $fileName);
}

/**
Expand Down