Merge pull request #29 from keboola/zajca-PST-1807

PST-1807 Native types PHP8

Author: AdamVyborny

.github/workflows/push.yml

@@ -81,8 +81,7 @@ jobs:
       -
         name: Run tests
         run: |
-          docker-compose run wait
-          docker-compose run --rm app composer ci
+          docker compose run --rm app composer ci
 
   tests-in-kbc:
     needs: build

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4-cli
+FROM php:8.3-cli
 
 ARG COMPOSER_FLAGS="--prefer-dist --no-interaction"
 ARG DEBIAN_FRONTEND=noninteractive
@@ -42,4 +42,4 @@ COPY . /code/
 # Run normal composer - all deps are cached already
 RUN composer install $COMPOSER_FLAGS
 
-CMD php ./src/app.php run /data
+CMD ["php", "/code/src/run.php"]

Dockerfile-tests

@@ -25,13 +25,13 @@ Application is prepared for run in container, you can start development same way
 
 1. Clone this repository: `git clone git@github.com:keboola/dynamodb-extractor.git`
 2. Change directory: `cd dynamodb-extractor`
-3. Build services: `docker-compose build`
-4. Run tests `docker-compose run --rm app composer ci`
+3. Build services: `docker compose build`
+4. Run tests `docker compose run --rm app composer ci`
 
 After seeing all tests green, continue:
 
-1. Run service: `docker-compose run --rm app-tests` (starts container with `bash`)
-2. Create tables/indexes and load sample data: `php init.php`
+1. Run service: `docker compose run --rm app bash`
+2. Create tables/indexes and load sample data: `php tests/fixtures/init.php`
 3. Write tests and code
 4. Run tests: `composer tests`
 

README.md

@@ -4,33 +4,38 @@
     "type": "project",
     "description": "Keboola DynamoDB Extractor",
     "require": {
-        "php": "^7.4",
+        "php": "^8.3",
         "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",
+        "keboola/csvmap": "^2",
         "monolog/monolog": "^2.6",
-        "keboola/php-component": "^9.0"
+        "keboola/php-component": "^10"
     },
     "require-dev": {
-        "keboola/coding-standard": "^13.0",
-        "phpunit/phpunit": "^9.5",
+        "keboola/coding-standard": "^15",
+        "keboola/datadir-tests": "^5.6",
+        "php-parallel-lint/php-parallel-lint": "^1.3",
         "phpstan/phpstan": "^1.7",
-        "symfony/process": "^5.4",
-        "php-parallel-lint/php-parallel-lint": "^1.3"
+        "phpunit/phpunit": "^9.5",
+        "symfony/process": "^5.4"
     },
     "autoload": {
         "psr-4": {
-            "Keboola\\": "src/Keboola/"
+            "Keboola\\": "src/Keboola/",
+            "Keboola\\DynamoDbExtractor\\Tests\\": "tests/phpunit/",
+            "Keboola\\DynamoDbExtractor\\FunctionalTests\\": "tests/functional/"
         }
     },
     "scripts": {
-        "tests-phpunit": "phpunit",
+        "tests-phpunit": "phpunit --testsuite unit",
+        "tests-datadir": "phpunit --testsuite functional",
         "tests": [
-            "php ./init.php",
-            "@tests-phpunit"
+            "php tests/fixtures/init.php",
+            "@tests-phpunit",
+            "@tests-datadir"
         ],
 
         "phpstan": "phpstan analyse ./src ./tests --level=max --no-progress -c phpstan.neon",