DamImpr · DamImpr · Oct 7, 2025 · Oct 7, 2025 · Oct 7, 2025 · Oct 7, 2025
diff --git a/.gitattributes b/.gitattributes
@@ -3,6 +3,6 @@ commands export-ignore
 .github/ export-ignore
 docker-compose.yml export-ignore
 entrypoint.sh export-ignore
-app/.php-cs-fixer.dist.php export-ignore
-app/phpstan.neon export-ignore
-app/rector.php export-ignore
+.php-cs-fixer.dist.php export-ignore
+phpstan.neon export-ignore
+rector.php export-ignore
diff --git a/.github/workflows/format-code.yml b/.github/workflows/format-code.yml
@@ -16,7 +16,6 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Validate composer.json and composer.lock
-      working-directory: ./app
       run: composer validate
 
     - name: Cache Composer packages
@@ -29,7 +28,6 @@ jobs:
           ${{ runner.os }}-php-
 
     - name: Install dependencies
-      working-directory: ./app
       run: composer install --prefer-dist --no-progress
 
     - name: format code

diff --git a/.github/workflows/test-sw.yml b/.github/workflows/test-sw.yml
@@ -15,7 +15,6 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Validate composer.json and composer.lock
-      working-directory: ./app
       run: composer validate
 
     - name: Cache Composer packages
@@ -28,7 +27,6 @@ jobs:
           ${{ runner.os }}-php-
 
     - name: Install dependencies
-      working-directory: ./app
       run: composer install --prefer-dist --no-progress
 
     - name: Run test suite

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,4 @@
 /nbproject/
 /vendor/
-/app/nbproject/
-/app/vendor/
-/app/.php-cs-fixer.cache
-/app/.phpdoc/
+/.php-cs-fixer.cache
+/.phpdoc/
diff --git a/app/.php-cs-fixer.dist.php → .php-cs-fixer.dist.php b/app/.php-cs-fixer.dist.php → .php-cs-fixer.dist.php
diff --git a/Dockerfile b/Dockerfile
@@ -18,15 +18,15 @@ RUN echo "apc.enable_cli=1" >> /usr/local/etc/php/php.ini
 RUN echo "apc.enable=1" >> /usr/local/etc/php/php.ini
 WORKDIR /app
 
-COPY app/composer.* ./
+COPY ./src ./src
+COPY ./tests ./tests
+COPY composer.* ./
 
 RUN composer install --no-interaction --no-scripts --no-autoloader --prefer-dist
 
-COPY ./app .
-
 RUN composer dump-autoload --optimize
 
 COPY ./entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/entrypoint.sh
 
-ENTRYPOINT ["entrypoint.sh"]
+ENTRYPOINT ["entrypoint.sh"]
diff --git a/app/composer.json → composer.json b/app/composer.json → composer.json
diff --git a/app/composer.lock → composer.lock b/app/composer.lock → composer.lock
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,14 @@ services:
   app:
     build: .
     volumes:
-      - ./app:/app
+      - ./src:/app/src
+      - ./tests:/app//tests
+      - ./vendor:/app/vendor
+      - ./composer.json:/app/composer.json
+      - ./composer.lock:/app/composer.lock
+      - ./rector.php:/app/rector.php
+      - ./phpstan.neon:/app/phpstan.neon
+      - ./.php-cs-fixer.dist.php:/app/.php-cs-fixer.dist.php
     networks:
       - cache-multi-layer-network
     depends_on:

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -3,6 +3,7 @@
 
 case "$1" in
     'test-sw')
+        composer install
         exec ./vendor/bin/phpunit ./tests/
         ;;
     'update-vendor')

diff --git a/app/phpstan.neon → phpstan.neon b/app/phpstan.neon → phpstan.neon
diff --git a/app/rector.php → rector.php b/app/rector.php → rector.php
diff --git a/app/src/Enum/CacheEnum.php → src/Enum/CacheEnum.php b/app/src/Enum/CacheEnum.php → src/Enum/CacheEnum.php
diff --git a/...on/CacheMissingConfigurationException.php → ...on/CacheMissingConfigurationException.php b/...on/CacheMissingConfigurationException.php → ...on/CacheMissingConfigurationException.php
diff --git a/app/src/Interface/Cacheable.php → src/Interface/Cacheable.php b/app/src/Interface/Cacheable.php → src/Interface/Cacheable.php
diff --git a/app/src/Service/ApcuCache.php → src/Service/ApcuCache.php b/app/src/Service/ApcuCache.php → src/Service/ApcuCache.php
diff --git a/app/src/Service/Cache.php → src/Service/Cache.php b/app/src/Service/Cache.php → src/Service/Cache.php
diff --git a/app/src/Service/CacheConfiguration.php → src/Service/CacheConfiguration.php b/app/src/Service/CacheConfiguration.php → src/Service/CacheConfiguration.php
diff --git a/app/src/Service/CacheManager.php → src/Service/CacheManager.php b/app/src/Service/CacheManager.php → src/Service/CacheManager.php
diff --git a/app/src/Service/CacheManagerImpl.php → src/Service/CacheManagerImpl.php b/app/src/Service/CacheManagerImpl.php → src/Service/CacheManagerImpl.php
diff --git a/app/src/Service/CacheManagerImplDryMode.php → src/Service/CacheManagerImplDryMode.php b/app/src/Service/CacheManagerImplDryMode.php → src/Service/CacheManagerImplDryMode.php
diff --git a/app/src/Service/MemcacheCache.php → src/Service/MemcacheCache.php b/app/src/Service/MemcacheCache.php → src/Service/MemcacheCache.php
diff --git a/app/src/Service/RedisCache.php → src/Service/RedisCache.php b/app/src/Service/RedisCache.php → src/Service/RedisCache.php
diff --git a/app/tests/AbstractCache.php → tests/AbstractCache.php b/app/tests/AbstractCache.php → tests/AbstractCache.php
diff --git a/app/tests/AbstractCacheManager.php → tests/AbstractCacheManager.php b/app/tests/AbstractCacheManager.php → tests/AbstractCacheManager.php
diff --git a/app/tests/ApcuCacheTest.php → tests/ApcuCacheTest.php b/app/tests/ApcuCacheTest.php → tests/ApcuCacheTest.php
diff --git a/app/tests/CacheManagerDryRunTest.php → tests/CacheManagerDryRunTest.php b/app/tests/CacheManagerDryRunTest.php → tests/CacheManagerDryRunTest.php
diff --git a/app/tests/CacheManagerMultiLevelTest.php → tests/CacheManagerMultiLevelTest.php b/app/tests/CacheManagerMultiLevelTest.php → tests/CacheManagerMultiLevelTest.php
diff --git a/app/tests/CacheManagerOneLevelTest.php → tests/CacheManagerOneLevelTest.php b/app/tests/CacheManagerOneLevelTest.php → tests/CacheManagerOneLevelTest.php
diff --git a/app/tests/Entity/Foo.php → tests/Entity/Foo.php b/app/tests/Entity/Foo.php → tests/Entity/Foo.php
diff --git a/app/tests/MemcacheCacheTest.php → tests/MemcacheCacheTest.php b/app/tests/MemcacheCacheTest.php → tests/MemcacheCacheTest.php
diff --git a/app/tests/RedisCacheTest.php → tests/RedisCacheTest.php b/app/tests/RedisCacheTest.php → tests/RedisCacheTest.php