Merge pull request #124 from keboola/zajca-pst-1434

Native types manifest support

Author: AdamVyborny

.github/workflows/push.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Build image and run tests
         run: |
           docker build -t $APP_IMAGE .
-          docker run -e CLIENT_ID -e CLIENT_SECRET -e ACCESS_TOKEN -e REFRESH_TOKEN -e VIEW_ID -e KBC_URL -e KBC_TOKEN -e KBC_COMPONENTID $APP_IMAGE composer ci
+          docker run -e KBC_DATA_TYPE_SUPPORT=none -e CLIENT_ID -e CLIENT_SECRET -e ACCESS_TOKEN -e REFRESH_TOKEN -e VIEW_ID -e KBC_URL -e KBC_TOKEN -e KBC_COMPONENTID $APP_IMAGE composer ci
       - name: Push image to ECR
         run: |
            docker pull quay.io/keboola/developer-portal-cli-v2:latest

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
@@ -9,6 +9,7 @@ WORKDIR /code/
 
 COPY docker/php-prod.ini /usr/local/etc/php/php.ini
 COPY docker/composer-install.sh /tmp/composer-install.sh
+COPY patches /code/patches
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         locales \

README.md

@@ -159,8 +159,8 @@ Clone this repository and init the workspace with following command
 ```
 git clone git@github.com:keboola/google-analytics-extractor.git
 cd google-analytics-extractor
-docker-compose build
-docker-compose run --rm dev composer install --no-interaction
+docker compose build
+docker compose run --rm dev composer install --no-interaction
 ```
 
 You will need working OAuth credentials.
@@ -182,7 +182,7 @@ VIEW_ID=
 Run the test suite using this command:
 
 ```
-docker-compose run --rm dev composer tests
+docker compose run --rm dev composer tests
 ```
 
 

composer.json

@@ -1,65 +1,85 @@
 {
-  "name": "keboola/google-analytics-extractor",
-  "license": "MIT",
-  "type": "project",
-  "description": "Keboola Google Analytics Extractor",
-  "keywords": ["keboola", "google", "analytics", "extractor"],
-  "require": {
-    "php": "^7.4",
-    "ext-json": "*",
-    "keboola/common-exceptions": "^1.1",
-    "keboola/csv": "^1.1",
-    "keboola/google-client-bundle": "^5.4",
-    "keboola/php-component": "^9.4",
-    "keboola/storage-api-client": "^12.9",
-    "symfony/config": "^5.2",
-    "symfony/finder": "^5.2",
-    "symfony/process": "^5.2"
-  },
-  "require-dev": {
-    "keboola/coding-standard": "^9.0",
-    "keboola/datadir-tests": "^5.3",
-    "php-parallel-lint/php-parallel-lint": "^1.2",
-    "phpstan/phpstan": "^0.12.59",
-    "phpunit/phpunit": "^9.5"
-  },
-  "autoload": {
-    "psr-4": {
-      "Keboola\\GoogleAnalyticsExtractor\\": "src/",
-      "Keboola\\": ["src/Keboola/", "tests/Keboola/"]
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Keboola\\GoogleAnalyticsExtractor\\Tests\\": "tests/phpunit/",
-      "Keboola\\GoogleAnalyticsExtractor\\Functional\\": "tests/functional/"
-    }
-  },
-  "scripts": {
-    "tests-phpunit": "phpunit",
-    "tests-datadir": "phpunit tests/functional",
-    "tests": [
-      "@tests-phpunit",
-      "@tests-datadir"
+    "name": "keboola/google-analytics-extractor",
+    "license": "MIT",
+    "type": "project",
+    "description": "Keboola Google Analytics Extractor",
+    "keywords": [
+        "keboola",
+        "google",
+        "analytics",
+        "extractor"
     ],
-
-    "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,
-    "optimize-autoloader": true
-  }
+    "require": {
+        "php": "^8.3",
+        "ext-json": "*",
+        "keboola/common-exceptions": "^1.1",
+        "keboola/csv": "^1.1",
+        "keboola/google-client-bundle": "^5.4",
+        "keboola/php-component": "^10.1",
+        "keboola/storage-api-client": "^12.9",
+        "symfony/config": "^5.2",
+        "symfony/finder": "^5.2",
+        "symfony/process": "^5.2"
+    },
+    "require-dev": {
+        "cweagans/composer-patches": "^1.7",
+        "keboola/coding-standard": "^15.0",
+        "keboola/datadir-tests": "^5.3",
+        "php-parallel-lint/php-parallel-lint": "^1.2",
+        "phpstan/phpstan": "^1.11",
+        "phpunit/phpunit": "^9.5",
+        "symplify/vendor-patches": "^11.3"
+    },
+    "autoload": {
+        "psr-4": {
+            "Keboola\\GoogleAnalyticsExtractor\\": "src/",
+            "Keboola\\": [
+                "src/Keboola/",
+                "tests/Keboola/"
+            ]
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Keboola\\GoogleAnalyticsExtractor\\Tests\\": "tests/phpunit/",
+            "Keboola\\GoogleAnalyticsExtractor\\Functional\\": "tests/functional/"
+        }
+    },
+    "scripts": {
+        "tests-phpunit": "phpunit --testdox",
+        "tests-datadir": "phpunit tests/functional",
+        "tests": [
+            "@tests-phpunit",
+            "@tests-datadir"
+        ],
+        "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,
+        "optimize-autoloader": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "cweagans/composer-patches": true
+        }
+    },
+    "extra": {
+        "patches": {
+            "keboola/csv": [
+                "patches/keboola-csv-src-keboola-csv-csvfile-php.patch"
+            ]
+        }
+    }
 }