Fixed docker compose setup

vshmakov · Feb 28, 2021 · 64997f3 · 64997f3
1 parent 4cc0ebf
commit 64997f3
Show file tree

Hide file tree

Showing 5 changed files with 177 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,8 @@ yarn-error.log
 npm-debug.log
 yarn-error.log
 ###< symfony/webpack-encore-bundle ###
+
+###> phpunit/phpunit ###
+/phpunit.xml
+.phpunit.result.cache
+###< phpunit/phpunit ###
diff --git a/composer.json b/composer.json
@@ -72,7 +72,8 @@
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
             "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd",
-            "security:check": "symfony-cmd"
+            "security:check": "symfony-cmd",
+            "security-checker security:check": "script"
         },
         "post-install-cmd": [
             "@auto-scripts"

diff --git a/config/docker/php/dockerfile b/config/docker/php/dockerfile
@@ -17,7 +17,8 @@ RUN docker-php-ext-install \
     pdo_mysql
 
 #install composer
-RUN curl --insecure https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer \
+RUN curl --insecure https://getcomposer.org/composer-1.phar -o /usr/bin/composer \
+    && chmod +x /usr/bin/composer \
     && composer self-update
 
 #clean cache

diff --git a/src/Repository/IpRepository.php b/src/Repository/IpRepository.php
@@ -31,6 +31,8 @@ public function __construct(RegistryInterface $registry, RequestStack $requestSt
 
     public function getCurrentRequestIp(): ?Ip
     {
+        return null;
+
         $request = $this->requestStack->getCurrentRequest();
 
         if (null === $request) {

diff --git a/symfony.lock b/symfony.lock
@@ -19,6 +19,12 @@
     "cocur/slugify": {
         "version": "v3.2"
     },
+    "composer/ca-bundle": {
+        "version": "1.1.4"
+    },
+    "easycorp/easy-log-handler": {
+        "version": "v1.0.7"
+    },
     "knplabs/knp-menu": {
         "version": "2.3.0"
     },
@@ -28,6 +34,9 @@
     "kunicmarko/sonata-auto-configure-bundle": {
         "version": "0.7.1"
     },
+    "myclabs/deep-copy": {
+        "version": "1.9.1"
+    },
     "nelmio/cors-bundle": {
         "version": "1.5",
         "recipe": {
@@ -40,6 +49,68 @@
             "./config/packages/nelmio_cors.yaml"
         ]
     },
+    "nikic/php-parser": {
+        "version": "v4.2.1"
+    },
+    "phar-io/manifest": {
+        "version": "1.0.3"
+    },
+    "phar-io/version": {
+        "version": "2.0.1"
+    },
+    "phpspec/prophecy": {
+        "version": "1.8.0"
+    },
+    "phpunit/php-code-coverage": {
+        "version": "7.0.3"
+    },
+    "phpunit/php-file-iterator": {
+        "version": "2.0.2"
+    },
+    "phpunit/php-text-template": {
+        "version": "1.2.1"
+    },
+    "phpunit/php-timer": {
+        "version": "2.1.1"
+    },
+    "phpunit/phpunit": {
+        "version": "4.7",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "master",
+            "version": "4.7",
+            "ref": "477e1387616f39505ba79715f43f124836020d71"
+        },
+        "files": [
+            ".env.test",
+            "phpunit.xml.dist",
+            "tests/bootstrap.php"
+        ]
+    },
+    "sebastian/code-unit-reverse-lookup": {
+        "version": "1.0.1"
+    },
+    "sebastian/comparator": {
+        "version": "3.0.2"
+    },
+    "sebastian/diff": {
+        "version": "3.0.2"
+    },
+    "sebastian/environment": {
+        "version": "4.2.1"
+    },
+    "sensiolabs/security-checker": {
+        "version": "4.0",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "master",
+            "version": "4.0",
+            "ref": "160c9b600564faa1224e8f387d49ef13ceb8b793"
+        },
+        "files": [
+            "config/packages/security_checker.yaml"
+        ]
+    },
     "sonata-project/admin-bundle": {
         "version": "3.31",
         "recipe": {
@@ -84,15 +155,107 @@
     "sonata-project/exporter": {
         "version": "2.0.1"
     },
+    "symfony/browser-kit": {
+        "version": "v4.2.7"
+    },
+    "symfony/css-selector": {
+        "version": "v4.2.7"
+    },
+    "symfony/debug-bundle": {
+        "version": "4.1",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "master",
+            "version": "4.1",
+            "ref": "f8863cbad2f2e58c4b65fa1eac892ab189971bea"
+        },
+        "files": [
+            "config/packages/dev/debug.yaml"
+        ]
+    },
+    "symfony/debug-pack": {
+        "version": "v1.0.7"
+    },
     "symfony/dom-crawler": {
         "version": "v4.2.4"
     },
+    "symfony/dotenv": {
+        "version": "v4.2.7"
+    },
+    "symfony/maker-bundle": {
+        "version": "1.0",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "master",
+            "version": "1.0",
+            "ref": "fadbfe33303a76e25cb63401050439aa9b1a9c7f"
+        }
+    },
+    "symfony/monolog-bundle": {
+        "version": "3.3",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "master",
+            "version": "3.3",
+            "ref": "d7249f7d560f6736115eee1851d02a65826f0a56"
+        },
+        "files": [
+            "config/packages/dev/monolog.yaml",
+            "config/packages/prod/deprecations.yaml",
+            "config/packages/prod/monolog.yaml",
+            "config/packages/test/monolog.yaml"
+        ]
+    },
+    "symfony/phpunit-bridge": {
+        "version": "4.1",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "master",
+            "version": "4.1",
+            "ref": "70bbb50fccafba9165d6d2602c7975d6d677455e"
+        },
+        "files": [
+            ".env.test",
+            "bin/phpunit",
+            "phpunit.xml.dist",
+            "tests/bootstrap.php"
+        ]
+    },
     "symfony/polyfill-intl-idn": {
         "version": "v1.11.0"
     },
+    "symfony/profiler-pack": {
+        "version": "v1.0.4"
+    },
     "symfony/security-acl": {
         "version": "v3.0.2"
     },
+    "symfony/var-dumper": {
+        "version": "v4.2.7"
+    },
+    "symfony/web-profiler-bundle": {
+        "version": "3.3",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "master",
+            "version": "3.3",
+            "ref": "6bdfa1a95f6b2e677ab985cd1af2eae35d62e0f6"
+        },
+        "files": [
+            "config/packages/dev/web_profiler.yaml",
+            "config/packages/test/web_profiler.yaml",
+            "config/routes/dev/web_profiler.yaml"
+        ]
+    },
+    "symfony/web-server-bundle": {
+        "version": "3.3",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "master",
+            "version": "3.3",
+            "ref": "dae9b39fd6717970be7601101ce5aa960bf53d9a"
+        }
+    },
     "symfony/webpack-encore-bundle": {
         "version": "1.0",
         "recipe": {
@@ -102,6 +265,9 @@
             "ref": "248c29c070dcd79e8333c676b0c5e284e3b365b5"
         }
     },
+    "theseer/tokenizer": {
+        "version": "1.1.2"
+    },
     "twig/extensions": {
         "version": "1.0",
         "recipe": {