chore: Sync changes from the template

tenantcloud · Apr 25, 2024 · 2a65fed · 2a65fed
1 parent 66847d5
commit 2a65fed
Show file tree

Hide file tree

Showing 10 changed files with 190 additions and 167 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -12,4 +12,4 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.md]
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: Release
 
 on:
     workflow_run:
-        workflows: ["Tests"]
+        workflows: ['Tests']
         types:
             - completed
         branches:
@@ -18,17 +18,17 @@ jobs:
         runs-on: ubuntu-latest
         if: ${{ github.event.workflow_run.conclusion == 'success' }}
         steps:
-            -   name: Checkout
-                uses: actions/checkout@v3
-                with:
-                    fetch-depth: 0
+            - name: Checkout
+              uses: actions/checkout@v3
+              with:
+                  fetch-depth: 0
 
-            -   name: Create a release
-                uses: cycjimmy/semantic-release-action@v3
-                with:
-                    extra_plugins: |
-                        @semantic-release/changelog
-                        @semantic-release/git
-                env:
-                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                    NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+            - name: Create a release
+              uses: cycjimmy/semantic-release-action@v3
+              with:
+                  extra_plugins: |
+                      @semantic-release/changelog
+                      @semantic-release/git
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/template-sync.yml b/.github/workflows/template-sync.yml
@@ -1,8 +1,6 @@
 name: Template sync
 
 on:
-    push:
-        branches: ['sync']
     workflow_dispatch:
     schedule:
         - cron: '*/5 * * * *'

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,105 +9,118 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ 8.1, 8.2 ]
-                test-bench: [ ^7.0, ^8.0 ]
+                php: [8.2]
+                test-bench: [^8.0]
 
         steps:
-            -   name: Checkout code
-                uses: actions/checkout@v3
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    tools: composer:v2
-                    coverage: none
-
-            -   name: Validate composer.json and composer.lock
-                run: composer validate
-
-            -   name: Cache Composer packages
-                id: composer-cache
-                uses: actions/cache@v3
-                with:
-                    path: vendor
-                    key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-                    restore-keys: |
-                        ${{ runner.os }}-php-
-
-            -   name: Install dependencies
-                run: |
-                    composer require "orchestra/testbench=${{ matrix.test-bench }}" --dev --no-update
-                    composer install --prefer-dist --no-progress
-
-            -   name: Execute phpunit
-                run: composer test -- --colors=always
+            - name: Checkout code
+              uses: actions/checkout@v3
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  tools: composer:v2
+                  coverage: none
+
+            - name: Validate composer.json and composer.lock
+              run: composer validate
+
+            - name: Cache Composer packages
+              id: composer-cache
+              uses: actions/cache@v3
+              with:
+                  path: vendor
+                  key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-php-
+
+            - name: Install dependencies
+              run: |
+                  composer require "orchestra/testbench=${{ matrix.test-bench }}" --dev --no-update
+                  composer install --prefer-dist --no-progress
+
+            - name: Execute phpunit
+              run: composer test -- --colors=always
 
     php-cs-fixer:
         name: php-cs-fixer
         runs-on: ubuntu-latest
         steps:
-            -   name: Checkout code
-                uses: actions/checkout@v3
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: 8.1
-                    extensions: dom, curl, libxml, mbstring, zip
-                    tools: composer:v2
-                    coverage: none
-
-            -   name: Cache Composer packages
-                id: composer-cache
-                uses: actions/cache@v3
-                with:
-                    path: vendor
-                    key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-                    restore-keys: |
-                        ${{ runner.os }}-php-
-
-            -   name: Install dependencies
-                run: composer install --prefer-dist --no-progress
-
-            -   name: Execute php-cs-fixer
-                run: composer cs-fix -- --dry-run --diff --using-cache=no
+            - name: Checkout code
+              uses: actions/checkout@v3
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.2
+                  extensions: dom, curl, libxml, mbstring, zip
+                  tools: composer:v2
+                  coverage: none
+
+            - name: Cache Composer packages
+              id: composer-cache
+              uses: actions/cache@v3
+              with:
+                  path: vendor
+                  key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-php-
+
+            - name: Install dependencies
+              run: composer install --prefer-dist --no-progress
+
+            - name: Execute php-cs-fixer
+              run: composer cs-fix -- --dry-run --diff --using-cache=no
+
+    prettier:
+        name: Prettier
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v3
+
+            - name: Run prettier
+              uses: actionsx/prettier@v2
+              with:
+                  args: --check .
 
     phpstan:
         name: PHPStan on PHP v${{ matrix.php }} & TestBench ${{ matrix.test-bench }}
         runs-on: ubuntu-latest
         strategy:
             fail-fast: true
             matrix:
-                php: [ 8.1, 8.2 ]
-                test-bench: [ ^7.0, ^8.0 ]
+                php: [8.2]
+                test-bench: [^8.0]
         steps:
-            -   name: Checkout code
-                uses: actions/checkout@v3
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    tools: composer:v2
-                    coverage: none
-
-            -   name: Validate composer.json and composer.lock
-                run: composer validate
-
-            -   name: Cache Composer packages
-                id: composer-cache
-                uses: actions/cache@v3
-                with:
-                    path: vendor
-                    key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-                    restore-keys: |
-                        ${{ runner.os }}-php-
-
-            -   name: Install dependencies
-                run: |
-                    composer require "orchestra/testbench=${{ matrix.test-bench }}" --dev --no-update
-                    composer install --prefer-dist --no-progress
-
-            -   name: Execute phpstan
-                run: composer phpstan
+            - name: Checkout code
+              uses: actions/checkout@v3
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  tools: composer:v2
+                  coverage: none
+
+            - name: Validate composer.json and composer.lock
+              run: composer validate
+
+            - name: Cache Composer packages
+              id: composer-cache
+              uses: actions/cache@v3
+              with:
+                  path: vendor
+                  key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-php-
+
+            - name: Install dependencies
+              run: |
+                  composer require "orchestra/testbench=${{ matrix.test-bench }}" --dev --no-update
+                  composer install --prefer-dist --no-progress
+
+            - name: Execute phpstan
+              run: composer phpstan
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@
 !.idea/fileTemplates
 
 # Dependencies
-/vendor/
+/vendor
 /composer.lock
 
 # Build/coverage
@@ -16,7 +16,7 @@
 **/.phpunit.result.cache
 
 # Temporary
-tmp/
+/tmp
 
 # Misc
 .DS_Store

diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,7 @@
+CHANGELOG.md
+
+/.idea
+/build
+/coverage
+/tmp
+/vendor
diff --git a/.prettierrc.yml b/.prettierrc.yml
@@ -0,0 +1 @@
+singleQuote: true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,7 +1,9 @@
 # Commands
 
 Here are some of the commands that you'll need:
- - install dependencies: `docker run -it --rm -v $PWD:/app -w /app chialab/php-dev:8.2 composer install`
- - run tests with phpunit: `docker run -it --rm -v $PWD:/app -w /app chialab/php-dev:8.2 composer test`
- - reformat using php-cs-fixer: `docker run -it --rm -v $PWD:/app -w /app chialab/php-dev:8.2 composer cs-fix`
- - analyse with phpstan: `docker run -it --rm -v $PWD:/app -w /app chialab/php-dev:8.2 composer phpstan`
+
+-   install dependencies: `docker run -it --rm -v $PWD:/app -w /app chialab/php-dev:8.2 composer install`
+-   run tests with phpunit: `docker run -it --rm -v $PWD:/app -w /app chialab/php-dev:8.2 composer test`
+-   reformat using php-cs-fixer: `docker run -it --rm -v $PWD:/app -w /app chialab/php-dev:8.2 composer cs-fix`
+-   reformat the rest with prettier: `docker run -it --rm -v $PWD:/app -w /app tmknom/prettier --write .`
+-   analyse with phpstan: `docker run -it --rm -v $PWD:/app -w /app chialab/php-dev:8.2 composer phpstan`
diff --git a/README.md b/README.md
@@ -5,6 +5,7 @@ Laravel mixins collection.
 ## Installation
 
 In your `composer.json`, add this repository:
+
 ```
 "repositories": [
     {
@@ -13,4 +14,5 @@ In your `composer.json`, add this repository:
     }
 ],
 ```
+
 Then do `composer require tenantcloud/laravel-mixins` to install the package.