Merge branch 'main' into feature/product-models

justbetter · Sep 26, 2023 · c04a7d9 · c04a7d9
2 parents ecc82e3 + 124a498
commit c04a7d9
Show file tree

Hide file tree

Showing 8 changed files with 115 additions and 101 deletions.
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -1,37 +1,32 @@
 name: style
 
-on: ['push', 'pull_request']
-
+on:
+    push:
+        branches:
+            - main
 jobs:
-    test:
-        runs-on: ${{ matrix.os }}
-        strategy:
-            fail-fast: true
-            matrix:
-                os: [ubuntu-latest]
-                php: [8.2]
-                laravel: [10.*]
-                stability: [prefer-stable]
-                include:
-                    - laravel: 10.*
-                      testbench: 8.*
-
-        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+    style:
+        name: Style
+        runs-on: ubuntu-latest
 
         steps:
-            - name: Checkout code
-              uses: actions/checkout@v2
+            -   name: Checkout code
+                uses: actions/checkout@v2
+
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: 8.2
+                    extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+                    coverage: none
+
+            -   name: Install dependencies
+                run: composer install
 
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-                  coverage: none
+            -   name: Style
+                run: composer fix-style
 
-            - name: Install dependencies
-              run: |
-                  composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-                  composer update --${{ matrix.stability }} --prefer-dist --no-interaction
-            - name: Style
-              run: composer style
+            -   name: Commit Changes
+                uses: stefanzweifel/git-auto-commit-action@v4
+                with:
+                    commit_message: Fix styling changes
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,24 @@
 # Changelog 
 
-[Unreleased changes](https://github.com/justbetter/laravel-akeneo-products/compare/1.0.1...main)
+[Unreleased changes](https://github.com/justbetter/laravel-akeneo-products/compare/1.0.3...main)
+## [1.0.3](https://github.com/justbetter/laravel-akeneo-products/releases/tag/1.0.3) - 2023-09-08
+
+### What's Changed
+* Fix interface namespace by @ramonrietdijk in https://github.com/justbetter/laravel-akeneo-products/pull/3
+
+
+**Full Changelog**: https://github.com/justbetter/laravel-akeneo-products/compare/1.0.2...1.0.3
+
+## [1.0.2](https://github.com/justbetter/laravel-akeneo-products/releases/tag/1.0.2) - 2023-09-04
+
+### What's Changed
+* Labels are not required in attribute options by @ramonrietdijk in https://github.com/justbetter/laravel-akeneo-products/pull/2
+
+### New Contributors
+* @ramonrietdijk made their first contribution in https://github.com/justbetter/laravel-akeneo-products/pull/2
+
+**Full Changelog**: https://github.com/justbetter/laravel-akeneo-products/compare/1.0.1...1.0.2
+
 ## [1.0.1](https://github.com/justbetter/laravel-akeneo-products/releases/tag/1.0.1) - 2023-06-27
 
 ### What's Changed

diff --git a/composer.json b/composer.json
@@ -1,68 +1,69 @@
 {
-    "name": "justbetter/laravel-akeneo-products",
-    "description": "Easily export products to Akeneo from your ERP",
-    "type": "package",
-    "license": "MIT",
-    "homepage": "https://github.com/justbetter/laravel-akeneo-products",
-    "authors": [
-        {
-            "name": "Ramon Rietdijk",
-            "email": "[email protected]",
-            "role": "Developer"
-        },
-        {
-            "name": "Vincent Boon",
-            "email": "[email protected]",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "php": "^8.1",
-        "justbetter/laravel-akeneo-client": "^1.1",
-        "justbetter/laravel-error-logger": "^2.3",
-        "laravel/framework": "^10.0",
-        "spatie/laravel-activitylog": "^4.7"
-    },
-    "require-dev": {
-        "laravel/pint": "^1.10",
-        "nunomaduro/larastan": "^2.6",
-        "orchestra/testbench": "^8.5",
-        "phpstan/phpstan-mockery": "^1.1",
-        "phpunit/phpunit": "^10.1"
-    },
-    "autoload": {
-        "psr-4": {
-            "JustBetter\\AkeneoProducts\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "JustBetter\\AkeneoProducts\\Tests\\": "tests"
-        }
+  "name": "justbetter/laravel-akeneo-products",
+  "description": "Easily export products to Akeneo from your ERP",
+  "type": "package",
+  "license": "MIT",
+  "homepage": "https://github.com/justbetter/laravel-akeneo-products",
+  "authors": [
+    {
+      "name": "Ramon Rietdijk",
+      "email": "[email protected]",
+      "role": "Developer"
     },
-    "scripts": {
-        "test": "phpunit",
-        "analyse": "phpstan",
-        "style": "pint --test",
-        "quality": [
-            "@test",
-            "@analyse",
-            "@style"
-        ]
-    },
-    "config": {
-        "sort-packages": true,
-        "allow-plugins": {
-            "php-http/discovery": true
-        }
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "JustBetter\\AkeneoProducts\\ServiceProvider"
-            ]
-        }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    {
+      "name": "Vincent Boon",
+      "email": "[email protected]",
+      "role": "Developer"
+    }
+  ],
+  "require": {
+    "php": "^8.1",
+    "justbetter/laravel-akeneo-client": "^1.1",
+    "justbetter/laravel-error-logger": "^2.3",
+    "laravel/framework": "^10.0",
+    "spatie/laravel-activitylog": "^4.7"
+  },
+  "require-dev": {
+    "laravel/pint": "^1.10",
+    "nunomaduro/larastan": "^2.6",
+    "orchestra/testbench": "^8.11",
+    "phpstan/phpstan-mockery": "^1.1",
+    "phpunit/phpunit": "^10.1"
+  },
+  "autoload": {
+    "psr-4": {
+      "JustBetter\\AkeneoProducts\\": "src"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "JustBetter\\AkeneoProducts\\Tests\\": "tests"
+    }
+  },
+  "scripts": {
+    "test": "phpunit",
+    "analyse": "phpstan",
+    "style": "pint --test",
+    "quality": [
+      "@test",
+      "@analyse",
+      "@style"
+    ],
+    "fix-style": "pint"
+  },
+  "config": {
+    "sort-packages": true,
+    "allow-plugins": {
+      "php-http/discovery": true
+    }
+  },
+  "extra": {
+    "laravel": {
+      "providers": [
+        "JustBetter\\AkeneoProducts\\ServiceProvider"
+      ]
+    }
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true
 }
diff --git a/src/Data/AttributeOptionData.php b/src/Data/AttributeOptionData.php
@@ -8,7 +8,7 @@ class AttributeOptionData extends Data
         'code' => 'required|string',
         'attribute' => 'required|string',
         'sort_order' => 'required|int',
-        'labels' => 'required|array',
+        'labels' => 'array',
     ];
 
     public function code(): string

diff --git a/src/Jobs/Product/ProcessProductsJob.php b/src/Jobs/Product/ProcessProductsJob.php
@@ -3,7 +3,7 @@
 namespace JustBetter\AkeneoProducts\Jobs\Product;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Broadcasting\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;

diff --git a/src/Jobs/Product/RetrieveProductJob.php b/src/Jobs/Product/RetrieveProductJob.php
@@ -3,7 +3,7 @@
 namespace JustBetter\AkeneoProducts\Jobs\Product;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Broadcasting\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;

diff --git a/src/Jobs/Product/SaveProductJob.php b/src/Jobs/Product/SaveProductJob.php
@@ -3,7 +3,7 @@
 namespace JustBetter\AkeneoProducts\Jobs\Product;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Broadcasting\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;

diff --git a/src/Jobs/Product/UpdateProductJob.php b/src/Jobs/Product/UpdateProductJob.php
@@ -3,7 +3,7 @@
 namespace JustBetter\AkeneoProducts\Jobs\Product;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Broadcasting\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;