Laravel 10 support (#2)

* Laravel 10 support * Fix styling --------- Co-authored-by: swapnilsarwe <[email protected]>
codeat3 · Feb 18, 2023 · ede13ce · ede13ce
1 parent 90df4b3
commit ede13ce
Show file tree

Hide file tree

Showing 6 changed files with 142 additions and 11 deletions.
diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
@@ -0,0 +1,82 @@
+name: Auto Update Icons
+
+on:
+  schedule:
+    - cron: '0 12 * * 1'
+
+jobs:
+  generate:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.0]
+        laravel: [^8.0]
+
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: Read DotEnv File
+        uses: c-py/action-dotenv-to-setenv@v2
+        with:
+          env-file: .env
+
+      - name: Checkout dependent repo
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ env.REPOSITORY }}
+          ref: ${{ env.BRANCH }}
+          path: ./dist
+
+      - id: latest-commit
+        name: Get the latest commit
+        run: |
+          echo 'LATEST_COMMIT<<EOF' >> $GITHUB_ENV
+          cd ./dist && git log  --format="%H" -n 1 >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+
+      - id: current-commit
+        name: Get current commot
+        uses: juliangruber/read-file-action@v1
+        with:
+          path: ./.commit
+
+      - name: Add versions to environment
+        run: |
+          echo "CURRENT_COMMIT=${{ steps.current-commit.outputs.content }}" >> $GITHUB_ENV
+
+      - name: Output versions
+        run: |
+          echo "Current commit: ${{ env.CURRENT_COMMIT }}"
+          echo "Latest commit: ${{ env.LATEST_COMMIT }}"
+
+      - name: Install dependencies
+        run: composer update --no-interaction --no-progress --dev
+
+      - name: Compile icons to resources directory
+        if: env.CURRENT_COMMIT != env.LATEST_COMMIT
+        run: ./vendor/bin/blade-icons-generate
+
+      - name: Update commit hash in ".commit"
+        if: env.CURRENT_COMMIT != env.LATEST_COMMIT
+        run: echo ${{ env.LATEST_COMMIT }}>./.commit
+
+      - name: Create PR for latest version
+        if: env.CURRENT_COMMIT != env.LATEST_COMMIT
+        uses: peter-evans/create-pull-request@v3
+        with:
+          commit-message: "auto-update: update icons with the latest commit ${{ env.LATEST_COMMIT }}"
+          committer: GitHub Action <[email protected]>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          title: "chore: update icons with the latest commit v${{ env.LATEST_COMMIT }}"
+          body: |
+            This updates from [${{ env.CURRENT_COMMIT }}](https://github.com/${{ env.REPOSITORY }}/commit/${{ env.CURRENT_COMMIT }}) to [${{ env.LATEST_COMMIT }}](https://github.com/${{ env.REPOSITORY }}/commit/${{ env.LATEST_COMMIT }}).
+            Check out the differences: [`${{ env.CURRENT_COMMIT }}` ... `${{ env.LATEST_COMMIT }}`](https://github.com/${{ env.REPOSITORY }}/compare/${{ env.CURRENT_COMMIT }}...${{ env.LATEST_COMMIT }})
+          branch: feature/update-${{ env.LATEST_COMMIT }}
+
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -0,0 +1,41 @@
+name: Check & fix styling
+
+on: [push]
+
+jobs:
+  php-cs-fixer:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.0]
+        laravel: [^8.0]
+
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip
+          coverage: none
+
+      - name: Install dependencies
+        run: composer update --prefer-dist --no-interaction --no-progress
+
+      - name: Run PHP CS Fixer
+        run: vendor/bin/php-cs-fixer fix
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Fix styling
+
+
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,18 +11,24 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4, '8.0', 8.1]
-        laravel: [8, 9]
+        php: [7.4, '8.0', 8.1, 8.2]
+        laravel: [8, 9, 10]
         exclude:
           - php: 7.4
             laravel: 9
+          - php: 7.4
+            laravel: 10
+          - php: '8.0'
+            laravel: 10
+          - php: 8.2
+            laravel: 8
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -38,3 +44,4 @@ jobs:
 
       - name: Execute tests
         run: vendor/bin/phpunit --verbose
+
diff --git a/.github/workflows/update-changelog.yaml b/.github/workflows/update-changelog.yaml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: main
 

diff --git a/composer.json b/composer.json
@@ -17,11 +17,12 @@
     "require": {
         "php": "^7.4|^8.0",
         "blade-ui-kit/blade-icons": "^1.1",
-        "illuminate/support": "^8.0|^9.0"
+        "illuminate/support": "^8.0|^9.0|^10.0"
     },
     "require-dev": {
+        "codeat3/blade-icon-generation-helpers": "^0.3",
         "codeat3/phpcs-styles": "^1.0",
-        "orchestra/testbench": "^6.0|^7.0",
+        "orchestra/testbench": "^6.0|^7.0|^8.0",
         "phpunit/phpunit": "^9.0"
     },
     "autoload": {

diff --git a/src/BladePixelArtIconsServiceProvider.php b/src/BladePixelArtIconsServiceProvider.php
@@ -5,8 +5,8 @@
 namespace Codeat3\BladePixelArtIcons;
 
 use BladeUI\Icons\Factory;
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Contracts\Container\Container;
+use Illuminate\Support\ServiceProvider;
 
 final class BladePixelArtIconsServiceProvider extends ServiceProvider
 {
@@ -17,24 +17,24 @@ public function register(): void
         $this->callAfterResolving(Factory::class, function (Factory $factory, Container $container) {
             $config = $container->make('config')->get('blade-pixelarticons', []);
 
-            $factory->add('pixelarticons', array_merge(['path' => __DIR__.'/../resources/svg'], $config));
+            $factory->add('pixelarticons', array_merge(['path' => __DIR__ . '/../resources/svg'], $config));
         });
     }
 
     private function registerConfig(): void
     {
-        $this->mergeConfigFrom(__DIR__.'/../config/blade-pixelarticons.php', 'blade-pixelarticons');
+        $this->mergeConfigFrom(__DIR__ . '/../config/blade-pixelarticons.php', 'blade-pixelarticons');
     }
 
     public function boot(): void
     {
         if ($this->app->runningInConsole()) {
             $this->publishes([
-                __DIR__.'/../resources/svg' => public_path('vendor/blade-pixelarticons'),
+                __DIR__ . '/../resources/svg' => public_path('vendor/blade-pixelarticons'),
             ], 'blade-pixelarticons');
 
             $this->publishes([
-                __DIR__.'/../config/blade-pixelarticons.php' => $this->app->configPath('blade-pixelarticons.php'),
+                __DIR__ . '/../config/blade-pixelarticons.php' => $this->app->configPath('blade-pixelarticons.php'),
             ], 'blade-pixelarticons-config');
         }
     }