Merge pull request #24 from keboola/COM-1533-update-packages

Update vendor packages

Author: ondrajodas

.github/workflows/push.yml

@@ -80,7 +80,9 @@ jobs:
           tag_as_latest: true
       -
         name: Run tests
-        run: docker-compose run --rm app-tests
+        run: |
+          docker-compose run wait
+          docker-compose run --rm app composer ci
 
   tests-in-kbc:
     needs: build

.gitignore

@@ -1,3 +1,4 @@
 .idea
 /vendor
 /data
+.phpunit.result.cache

Dockerfile

@@ -1,20 +1,45 @@
-FROM php:7.2
-ENV DEBIAN_FRONTEND noninteractive
+FROM php:7.4-cli
 
-RUN apt-get update -q \
-  && apt-get install unzip wait-for-it git -y --no-install-recommends \
-  && rm -rf /var/lib/apt/lists/*
+ARG COMPOSER_FLAGS="--prefer-dist --no-interaction"
+ARG DEBIAN_FRONTEND=noninteractive
+ENV COMPOSER_ALLOW_SUPERUSER 1
+ENV COMPOSER_PROCESS_TIMEOUT 3600
 
-WORKDIR /root
+WORKDIR /code/
 
-RUN curl -sS https://getcomposer.org/installer | php \
-  && mv composer.phar /usr/local/bin/composer
+COPY docker/php/php-prod.ini /usr/local/etc/php/php.ini
+COPY docker/composer-install.sh /tmp/composer-install.sh
 
-COPY ./docker/php/php-prod.ini /usr/local/etc/php/php.ini
-COPY . /code
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        git \
+        wait-for-it \
+        locales \
+        unzip \
+        libicu-dev \
+    && rm -r /var/lib/apt/lists/* \
+	&& sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
+	&& locale-gen \
+    && chmod +x /tmp/composer-install.sh \
+    && /tmp/composer-install.sh
 
-WORKDIR /code
+RUN docker-php-ext-configure intl \
+    && docker-php-ext-install intl
 
-RUN composer install --prefer-dist --no-interaction
+ENV LANGUAGE=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
+
+## Composer - deps always cached unless changed
+# First copy only composer files
+COPY composer.* /code/
+
+# Download dependencies, but don't run scripts or init autoloaders as the app is missing
+RUN composer install $COMPOSER_FLAGS --no-scripts --no-autoloader
+
+# Copy rest of the app
+COPY . /code/
+
+# Run normal composer - all deps are cached already
+RUN composer install $COMPOSER_FLAGS
 
 CMD php ./src/app.php run /data

composer.json

@@ -3,34 +3,55 @@
     "license": "MIT",
     "type": "project",
     "description": "Keboola DynamoDB Extractor",
-    "keywords": ["keboola", "dynamodb", "extractor", "aws"],
-    "authors": [
-        {
-            "name": "Vladimír Kriška",
-            "email": "vlado@keboola.com"
-        }
-    ],
     "require": {
-        "php": "^7.1",
-        "aws/aws-sdk-php": "^3.19",
-        "symfony/console": "^4.0",
-        "symfony/serializer": "^4.0",
-        "symfony/filesystem": "^4.0",
-        "nette/utils": "^2.4",
-        "keboola/csvmap": "^0.3",
-        "monolog/monolog": "^1.22",
-        "keboola/php-component": "^2.1"
+        "php": "^7.4",
+        "aws/aws-sdk-php": "^3.224",
+        "symfony/console": "^5.4",
+        "symfony/serializer": "^5.4",
+        "symfony/filesystem": "^5.4",
+        "nette/utils": "^3.2",
+        "keboola/csvmap": "^1.1",
+        "monolog/monolog": "^2.6",
+        "keboola/php-component": "^9.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.3",
-        "squizlabs/php_codesniffer": "^3.2",
-        "symfony/process": "^4.0"
+        "keboola/coding-standard": "^13.0",
+        "phpunit/phpunit": "^9.5",
+        "phpstan/phpstan": "^1.7",
+        "symfony/process": "^5.4",
+        "php-parallel-lint/php-parallel-lint": "^1.3"
     },
     "autoload": {
         "psr-4": {
             "Keboola\\": "src/Keboola/"
         }
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    "scripts": {
+        "tests-phpunit": "phpunit",
+        "tests": [
+            "php ./init.php",
+            "@tests-phpunit"
+        ],
+
+        "phpstan": "phpstan analyse ./src ./tests --level=max --no-progress -c phpstan.neon",
+        "phpcs": "phpcs -n --ignore=vendor --extensions=php .",
+        "phpcbf": "phpcbf -n --ignore=vendor --extensions=php .",
+        "phplint": "parallel-lint -j 10 --exclude vendor .",
+        "build": [
+            "@phplint",
+            "@phpcs",
+            "@phpstan",
+            "@tests"
+        ],
+        "ci": [
+            "@composer validate --no-check-publish --no-check-all",
+            "@build"
+        ]
+    },
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    }
 }