Merge pull request #1970 from shlinkio/develop

Release 3.7.3
shlinkio · Jan 4, 2024 · 361d987 · 361d987
2 parents 26c2aaf + 6017db2
commit 361d987
Show file tree

Hide file tree

Showing 44 changed files with 41 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,24 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [3.7.3] - 2024-01-04
+### Added
+* *Nothing*
+
+### Changed
+* [#1968](https://github.com/shlinkio/shlink/issues/1968) Move migrations from `data` to `module/Core`.
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1967](https://github.com/shlinkio/shlink/issues/1967) Allow an empty dir to be mounted in `data` when using the docker image.
+
+
 ## [3.7.2] - 2023-12-26
 ### Added
 * *Nothing*

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -46,17 +46,18 @@ This is a simplified version of the project structure:
 ```
 shlink
 ├── bin
-│   └── cli
+│   ├── cli
+│   └── [...]
 ├── config
 │   ├── autoload
 │   ├── params
 │   ├── config.php
-│   └── container.php
+│   ├── container.php
+│   └── [...]
 ├── data
 │   ├── cache
 │   ├── locks
 │   ├── log
-│   ├── migrations
 │   └── proxies
 ├── docs
 │   ├── adr
@@ -67,6 +68,7 @@ shlink
 │   ├── Core
 │   └── Rest
 ├── public
+│   └── [...]
 ├── composer.json
 └── README.md
 ```
@@ -75,7 +77,7 @@ The purposes of every folder are:
 
 * `bin`: It contains the CLI tools. The `cli` one is the main entry point to run Shlink from the command line.
 * `config`: Contains application-wide configurations, which are later merged with the ones provided by every module.
-* `data`: Common runtime-generated git-ignored assets, like logs, caches, etc.
+* `data`: Common git-ignored assets, like logs, caches, lock files, GeoLite DB files, etc. It's the only location where Shlink may need to write at runtime.
 * `docs`: Any project documentation is stored here, like API spec definitions or architectural decision records.
 * `module`: Contains a sub-folder for every module in the project. Modules contain the source code, tests and configurations for every context in the project.
 * `public`: Few assets (like `favicon.ico` or `robots.txt`) and the web entry point are stored here. This web entry point is not used when serving the app with RoadRunner or openswoole.

diff --git a/composer.json b/composer.json
@@ -75,7 +75,7 @@
         "phpunit/phpunit": "^10.4",
         "roave/security-advisories": "dev-master",
         "shlinkio/php-coding-standard": "~2.3.0",
-        "shlinkio/shlink-test-utils": "^3.8",
+        "shlinkio/shlink-test-utils": "^3.8.1",
         "symfony/var-dumper": "^6.3",
         "veewee/composer-run-parallel": "^1.3"
     },
@@ -116,7 +116,7 @@
         ],
         "cs": "phpcs -s",
         "cs:fix": "phpcbf",
-        "stan": "APP_ENV=test php vendor/bin/phpstan analyse module/*/src module/*/test* module/*/config config docker/config data/migrations --level=8",
+        "stan": "APP_ENV=test php vendor/bin/phpstan analyse module/*/src module/*/test* module/*/config module/*/migrations config docker/config --level=8",
         "test": [
             "@parallel test:unit test:db",
             "@parallel test:api test:cli"

diff --git a/config/autoload/router.global.php b/config/autoload/router.global.php
@@ -11,7 +11,9 @@
         'base_path' => EnvVars::BASE_PATH->loadFromEnv(''),
 
         'fastroute' => [
-            FastRouteRouter::CONFIG_CACHE_ENABLED => true,
+            // Disabling config cache for cli, ensures it's never used for openswoole/RoadRunner, and also that console
+            // commands don't generate a cache file that's then used by php-fpm web executions
+            FastRouteRouter::CONFIG_CACHE_ENABLED => PHP_SAPI !== 'cli',
             FastRouteRouter::CONFIG_CACHE_FILE => 'data/cache/fastroute_cached_routes.php',
         ],
     ],

diff --git a/config/cli-config.php b/config/cli-config.php
@@ -11,7 +11,7 @@
 return (static function () {
     $migrationsConfig = [
         'migrations_paths' => [
-            'ShlinkMigrations' => 'data/migrations',
+            'ShlinkMigrations' => 'module/Core/migrations',
         ],
         'table_storage' => [
             'table_name' => 'migrations',

diff --git a/config/test/bootstrap_api_tests.php b/config/test/bootstrap_api_tests.php
@@ -29,10 +29,10 @@
 });
 
 $testHelper->createTestDb(
-    ['bin/cli', 'db:create'],
-    ['bin/cli', 'db:migrate'],
-    ['bin/doctrine', 'orm:schema-tool:drop'],
-    ['bin/doctrine', 'dbal:run-sql'],
+    createDbCommand: ['bin/cli', 'db:create'],
+    migrateDbCommand: ['bin/cli', 'db:migrate'],
+    dropSchemaCommand: ['bin/doctrine', 'orm:schema-tool:drop'],
+    runSqlCommand: ['bin/doctrine', 'dbal:run-sql'],
 );
 ApiTest\ApiTestCase::setApiClient($httpClient);
 ApiTest\ApiTestCase::setSeedFixturesCallback(fn () => $testHelper->seedFixtures($em, $config['data_fixtures'] ?? []));
diff --git a/config/test/bootstrap_db_tests.php b/config/test/bootstrap_db_tests.php
@@ -9,9 +9,9 @@
 /** @var ContainerInterface $container */
 $container = require __DIR__ . '/../container.php';
 $container->get(Helper\TestHelper::class)->createTestDb(
-    ['bin/cli', 'db:create'],
-    ['bin/cli', 'db:migrate'],
-    ['bin/doctrine', 'orm:schema-tool:drop'],
-    ['bin/doctrine', 'dbal:run-sql'],
+    createDbCommand: ['bin/cli', 'db:create'],
+    migrateDbCommand: ['bin/cli', 'db:migrate'],
+    dropSchemaCommand: ['bin/doctrine', 'orm:schema-tool:drop'],
+    runSqlCommand: ['bin/doctrine', 'dbal:run-sql'],
 );
 DbTest\DatabaseTestCase::setEntityManager($container->get('em'));
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
@@ -3,6 +3,9 @@ set -e
 
 cd /etc/shlink
 
+# Create data directories if they do not exist. This allows data dir to be mounted as an empty dir if needed
+mkdir -p data/cache data/locks data/log data/proxies
+
 flags="--no-interaction --clear-db-cache"
 
 # Skip downloading GeoLite2 db file if the license key env var was not defined or skipping was explicitly set

diff --git a/data/migrations/Version20160819142757.php → ...Core/migrations/Version20160819142757.php b/data/migrations/Version20160819142757.php → ...Core/migrations/Version20160819142757.php
diff --git a/data/migrations/Version20160820191203.php → ...Core/migrations/Version20160820191203.php b/data/migrations/Version20160820191203.php → ...Core/migrations/Version20160820191203.php
diff --git a/data/migrations/Version20171021093246.php → ...Core/migrations/Version20171021093246.php b/data/migrations/Version20171021093246.php → ...Core/migrations/Version20171021093246.php
diff --git a/data/migrations/Version20171022064541.php → ...Core/migrations/Version20171022064541.php b/data/migrations/Version20171022064541.php → ...Core/migrations/Version20171022064541.php
diff --git a/data/migrations/Version20180801183328.php → ...Core/migrations/Version20180801183328.php b/data/migrations/Version20180801183328.php → ...Core/migrations/Version20180801183328.php
diff --git a/data/migrations/Version20180913205455.php → ...Core/migrations/Version20180913205455.php b/data/migrations/Version20180913205455.php → ...Core/migrations/Version20180913205455.php
diff --git a/data/migrations/Version20180915110857.php → ...Core/migrations/Version20180915110857.php b/data/migrations/Version20180915110857.php → ...Core/migrations/Version20180915110857.php
diff --git a/data/migrations/Version20181020060559.php → ...Core/migrations/Version20181020060559.php b/data/migrations/Version20181020060559.php → ...Core/migrations/Version20181020060559.php
diff --git a/data/migrations/Version20181020065148.php → ...Core/migrations/Version20181020065148.php b/data/migrations/Version20181020065148.php → ...Core/migrations/Version20181020065148.php
diff --git a/data/migrations/Version20181110175521.php → ...Core/migrations/Version20181110175521.php b/data/migrations/Version20181110175521.php → ...Core/migrations/Version20181110175521.php
diff --git a/data/migrations/Version20190824075137.php → ...Core/migrations/Version20190824075137.php b/data/migrations/Version20190824075137.php → ...Core/migrations/Version20190824075137.php
diff --git a/data/migrations/Version20190930165521.php → ...Core/migrations/Version20190930165521.php b/data/migrations/Version20190930165521.php → ...Core/migrations/Version20190930165521.php
diff --git a/data/migrations/Version20191001201532.php → ...Core/migrations/Version20191001201532.php b/data/migrations/Version20191001201532.php → ...Core/migrations/Version20191001201532.php
diff --git a/data/migrations/Version20191020074522.php → ...Core/migrations/Version20191020074522.php b/data/migrations/Version20191020074522.php → ...Core/migrations/Version20191020074522.php
diff --git a/data/migrations/Version20200105165647.php → ...Core/migrations/Version20200105165647.php b/data/migrations/Version20200105165647.php → ...Core/migrations/Version20200105165647.php
diff --git a/data/migrations/Version20200106215144.php → ...Core/migrations/Version20200106215144.php b/data/migrations/Version20200106215144.php → ...Core/migrations/Version20200106215144.php
diff --git a/data/migrations/Version20200110182849.php → ...Core/migrations/Version20200110182849.php b/data/migrations/Version20200110182849.php → ...Core/migrations/Version20200110182849.php
diff --git a/data/migrations/Version20200323190014.php → ...Core/migrations/Version20200323190014.php b/data/migrations/Version20200323190014.php → ...Core/migrations/Version20200323190014.php
diff --git a/data/migrations/Version20200503170404.php → ...Core/migrations/Version20200503170404.php b/data/migrations/Version20200503170404.php → ...Core/migrations/Version20200503170404.php
diff --git a/data/migrations/Version20201023090929.php → ...Core/migrations/Version20201023090929.php b/data/migrations/Version20201023090929.php → ...Core/migrations/Version20201023090929.php
diff --git a/data/migrations/Version20201102113208.php → ...Core/migrations/Version20201102113208.php b/data/migrations/Version20201102113208.php → ...Core/migrations/Version20201102113208.php
diff --git a/data/migrations/Version20210102174433.php → ...Core/migrations/Version20210102174433.php b/data/migrations/Version20210102174433.php → ...Core/migrations/Version20210102174433.php
diff --git a/data/migrations/Version20210118153932.php → ...Core/migrations/Version20210118153932.php b/data/migrations/Version20210118153932.php → ...Core/migrations/Version20210118153932.php
diff --git a/data/migrations/Version20210202181026.php → ...Core/migrations/Version20210202181026.php b/data/migrations/Version20210202181026.php → ...Core/migrations/Version20210202181026.php
diff --git a/data/migrations/Version20210207100807.php → ...Core/migrations/Version20210207100807.php b/data/migrations/Version20210207100807.php → ...Core/migrations/Version20210207100807.php
diff --git a/data/migrations/Version20210306165711.php → ...Core/migrations/Version20210306165711.php b/data/migrations/Version20210306165711.php → ...Core/migrations/Version20210306165711.php
diff --git a/data/migrations/Version20210522051601.php → ...Core/migrations/Version20210522051601.php b/data/migrations/Version20210522051601.php → ...Core/migrations/Version20210522051601.php
diff --git a/data/migrations/Version20210522124633.php → ...Core/migrations/Version20210522124633.php b/data/migrations/Version20210522124633.php → ...Core/migrations/Version20210522124633.php
diff --git a/data/migrations/Version20210720143824.php → ...Core/migrations/Version20210720143824.php b/data/migrations/Version20210720143824.php → ...Core/migrations/Version20210720143824.php
diff --git a/data/migrations/Version20211002072605.php → ...Core/migrations/Version20211002072605.php b/data/migrations/Version20211002072605.php → ...Core/migrations/Version20211002072605.php
diff --git a/data/migrations/Version20220110113313.php → ...Core/migrations/Version20220110113313.php b/data/migrations/Version20220110113313.php → ...Core/migrations/Version20220110113313.php
diff --git a/data/migrations/Version20230103105343.php → ...Core/migrations/Version20230103105343.php b/data/migrations/Version20230103105343.php → ...Core/migrations/Version20230103105343.php
diff --git a/data/migrations/Version20230130090946.php → ...Core/migrations/Version20230130090946.php b/data/migrations/Version20230130090946.php → ...Core/migrations/Version20230130090946.php
diff --git a/data/migrations/Version20230211171904.php → ...Core/migrations/Version20230211171904.php b/data/migrations/Version20230211171904.php → ...Core/migrations/Version20230211171904.php
diff --git a/data/migrations/Version20230303164233.php → ...Core/migrations/Version20230303164233.php b/data/migrations/Version20230303164233.php → ...Core/migrations/Version20230303164233.php
diff --git a/phpcs.xml b/phpcs.xml
@@ -12,7 +12,6 @@
     <!-- Paths to check -->
     <file>bin</file>
     <file>module</file>
-    <file>data/migrations</file>
     <file>config</file>
     <file>docker/config</file>
     <file>public/index.php</file>