From 5eb2fcc98e2eac11c926ee9d4fe391e4741cffb7 Mon Sep 17 00:00:00 2001
From: Oliver Klee <oliver@phplist.com>
Date: Sun, 18 Feb 2018 19:03:07 +0100
Subject: [PATCH] [CLEANUP] Rename web/ to public/

This will bring the project closer to the default Symfony
project structure.
---
 .gitignore                                 |  2 +-
 CHANGELOG.md                               |  2 +-
 composer.json                              |  2 +-
 tests/Integration/Composer/ScriptsTest.php | 16 ++++++++--------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3d2db41..f00fc74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,6 @@
 /Configuration/parameters.yml
 /Configuration/routing_modules.yml
 /nbproject
+/public/
 /var/
 /vendor/
-/web/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4388f2a..28fd152 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
 
diff --git a/composer.json b/composer.json
index 7b1b997..fca15d1 100644
--- a/composer.json
+++ b/composer.json
@@ -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": [
diff --git a/tests/Integration/Composer/ScriptsTest.php b/tests/Integration/Composer/ScriptsTest.php
index 45967b2..c13707a 100644
--- a/tests/Integration/Composer/ScriptsTest.php
+++ b/tests/Integration/Composer/ScriptsTest.php
@@ -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'],
@@ -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);
     }
 
     /**