Support Laravel 10.x

- Drop supporting Laravel < 10.x
- Drop supporting PHP < 8.1

.editorconfig

@@ -2,9 +2,9 @@ root = true
 
 [*]
 charset = utf-8
+end_of_line = lf
 indent_size = 4
 indent_style = space
-end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 

.gitattributes

@@ -9,6 +9,7 @@
 /art export-ignore
 /docs export-ignore
 /tests export-ignore
+/workbench export-ignore
 /.editorconfig export-ignore
 /.php_cs.dist.php export-ignore
 /psalm.xml export-ignore

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: mohamedsabil83
-custom: ["https://paypal.me/technolizer"]
+custom: [ "https://paypal.me/technolizer" ]

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,66 @@
+name: Bug Report
+description: Report an Issue or Bug with the Package
+title: "[Bug]: "
+labels: ["bug"]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ We're sorry to hear you have a problem. Can you help us solve it by providing the following details.
+ - type: textarea
+ id: what-happened
+ attributes:
+ label: What happened?
+ description: What did you expect to happen?
+ placeholder: I cannot currently do X thing because when I do, it breaks X thing.
+ validations:
+ required: true
+ - type: textarea
+ id: how-to-reproduce
+ attributes:
+ label: How to reproduce the bug
+ description: How did this occur, please add any config values used and provide a set of reliable steps if possible.
+ placeholder: When I do X I see Y.
+ validations:
+ required: true
+ - type: input
+ id: package-version
+ attributes:
+ label: Package Version
+ description: What version of our Package are you running? Please be as specific as possible
+ placeholder: 2.0.0
+ validations:
+ required: true
+ - type: input
+ id: php-version
+ attributes:
+ label: PHP Version
+ description: What version of PHP are you running? Please be as specific as possible
+ placeholder: 8.2.0
+ validations:
+ required: true
+ - type: input
+ id: laravel-version
+ attributes:
+ label: Laravel Version
+ description: What version of Laravel are you running? Please be as specific as possible
+ placeholder: 9.0.0
+ validations:
+ required: true
+ - type: dropdown
+ id: operating-systems
+ attributes:
+ label: Which operating systems does with happen with?
+ description: You may select more than one.
+ multiple: true
+ options:
+ - macOS
+ - Windows
+ - Linux
+ - type: textarea
+ id: notes
+ attributes:
+ label: Notes
+ description: Use this field to provide any other notes that you feel might be relevant to the issue.
+ validations:
+ required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -9,6 +9,3 @@ contact_links:
  - name: Report a security issue
  url: https://github.com/mohamedsabil83/laravel-hijrian/security/policy
  about: Learn how to notify us for sensitive bugs
- - name: Report a bug
- url: https://github.com/mohamedsabil83/laravel-hijrian/issues/new
- about: Report a reproducable bug

.github/dependabot.yml

@@ -9,4 +9,11 @@ updates:
  schedule:
  interval: "weekly"
  labels:
- - "dependencies"
+ - "dependencies"
+
+ - package-ecosystem: "composer"
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ labels:
+ - "dependencies"

.github/workflows/dependabot-auto-merge.yml

@@ -8,22 +8,23 @@ permissions:
 jobs:
  dependabot:
  runs-on: ubuntu-latest
+ timeout-minutes: 5
  if: ${{ github.actor == 'dependabot[bot]' }}
  steps:
- 
+
  - name: Dependabot metadata
  id: metadata
  uses: dependabot/[email protected]
  with:
  github-token: "${{ secrets.GITHUB_TOKEN }}"
- 
+
  - name: Auto-merge Dependabot PRs for semver-minor updates
  if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
  run: gh pr merge --auto --merge "$PR_URL"
  env:
  PR_URL: ${{github.event.pull_request.html_url}}
  GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- 
+
  - name: Auto-merge Dependabot PRs for semver-patch updates
  if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
  run: gh pr merge --auto --merge "$PR_URL"

.github/workflows/php-cs-fixer.yml → .github/workflows/fix-php-code-style-issues.yml

@@ -1,21 +1,26 @@
-name: Check & fix styling
+name: Fix PHP code style issues
 
-on: [push]
+on:
+ push:
+ paths:
+ - '**.php'
+
+permissions:
+ contents: write
 
 jobs:
- php-cs-fixer:
+ php-code-styling:
  runs-on: ubuntu-latest
+ timeout-minutes: 5
 
  steps:
  - name: Checkout code
  uses: actions/checkout@v4
  with:
  ref: ${{ github.head_ref }}
 
- - name: Run PHP CS Fixer
- uses: docker://oskarstark/php-cs-fixer-ga
- with:
- args: --config=.php_cs.dist.php --allow-risky=yes
+ - name: Fix PHP code style issues
+ uses: aglipanci/[email protected]
 
  - name: Commit changes
  uses: stefanzweifel/git-auto-commit-action@v5

.github/workflows/phpstan.yml

@@ -5,18 +5,20 @@ on:
  paths:
  - '**.php'
  - 'phpstan.neon.dist'
+ - '.github/workflows/phpstan.yml'
 
 jobs:
  phpstan:
  name: phpstan
  runs-on: ubuntu-latest
+ timeout-minutes: 5
  steps:
  - uses: actions/checkout@v4
 
  - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
- php-version: '8.0'
+ php-version: '8.1'
  coverage: none
 
  - name: Install composer dependencies

.github/workflows/run-tests.yml

@@ -2,25 +2,25 @@ name: run-tests
 
 on:
  push:
- branches: [main]
+ branches: [ main ]
  pull_request:
- branches: [main]
+ branches: [ main ]
 
 jobs:
  test:
  runs-on: ${{ matrix.os }}
+ timeout-minutes: 5
  strategy:
  fail-fast: true
  matrix:
- os: [ubuntu-latest]
- php: [8.1, 8.0]
- laravel: [9.*, 8.*]
- stability: [prefer-stable]
+ os: [ ubuntu-latest, windows-latest ]
+ php: [ 8.3, 8.2, 8.1 ]
+ laravel: [ 10.* ]
+ stability: [ prefer-lowest, prefer-stable ]
  include:
- - laravel: 9.*
- testbench: 7.*
- - laravel: 8.*
- testbench: 6.*
+ - laravel: 10.*
+ testbench: 8.*
+ carbon: ^2.63
 
  name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -42,8 +42,11 @@ jobs:
 
  - name: Install dependencies
  run: |
- composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+ composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
  composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
+ - name: List Installed Dependencies
+ run: composer show -D
+
  - name: Execute tests
- run: vendor/bin/pest
+ run: vendor/bin/pest --ci

.github/workflows/update-changelog.yml

@@ -4,9 +4,13 @@ on:
  release:
  types: [released]
 
+permissions:
+ contents: write
+
 jobs:
  update:
  runs-on: ubuntu-latest
+ timeout-minutes: 5
 
  steps:
  - name: Checkout code

.gitignore

@@ -1,7 +1,5 @@
 .idea
-.php_cs
-.php_cs.cache
-.phpunit.result.cache
+.phpunit.cache
 build
 composer.lock
 coverage
@@ -11,4 +9,3 @@ phpstan.neon
 testbench.yaml
 vendor
 node_modules
-.php-cs-fixer.cache

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) mohamedsabil83 <[email protected]>
+Copyright (c) MohamedSabil83 <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal