Merge pull request #81 from Hi-Folks/upgrade/laralens-1

Upgrade/laralens 1
Hi-Folks · Mar 13, 2024 · 04c2b95 · 04c2b95
2 parents 41a9641 + a413ec7
commit 04c2b95
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 51 deletions.
diff --git a/.github/workflows/php-code-quality.yml b/.github/workflows/php-code-quality.yml
@@ -5,6 +5,7 @@ on:
       - develop
       - features/**
       - feature/**
+      - upgrade/**
   pull_request:
       branches: [ develop ]
 
@@ -13,7 +14,7 @@ jobs:
     strategy:
         matrix:
             operating-system: [ubuntu-latest]
-            php-versions: [ '8.3', '8.2', '8.1', '8.0' ]
+            php-versions: [ '8.3', '8.2', '8.1' ]
             dependency-stability: [ 'prefer-stable','prefer-lowest' ]
 
     runs-on: ${{ matrix.operating-system }}
@@ -22,7 +23,7 @@ jobs:
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install PHP versions
       uses: shivammathur/setup-php@v2
       with:

diff --git a/.github/workflows/php-lint.yml b/.github/workflows/php-lint.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
 
     - name: Validate composer.json and composer.lock
@@ -25,6 +25,6 @@ jobs:
       run: composer run-script test
 
     - name: PHP Syntax Checker (Lint)
-      uses: StephaneBour/actions-php-lint@8.0
+      uses: StephaneBour/actions-php-lint@8.2
       with:
         dir: './src'
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ composer.lock
 vendor
 coverage
 .phpunit.result.cache
+.phpunit.cache/
 .idea
 .php_cs.cache
 .vscode
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.0.0 - 2024-03-13
+- upgrading packages
+
 ## 0.5.2 - 2024-03-12
 - Updating hints for missing lang directory
 

diff --git a/composer.json b/composer.json
@@ -21,23 +21,20 @@
         }
     ],
     "require": {
-        "php": "^8.0|^8.1|^8.2",
+        "php": "^8.0|^8.1|^8.2|^8.3",
         "ext-json": "*",
-        "guzzlehttp/guzzle": "^7.0",
-        "illuminate/support": "v8.75.0|^9.0|^10.0|^11.0",
-        "nunomaduro/termwind": "^1.13|^2.0"
+        "guzzlehttp/guzzle": "^7.8",
+        "nunomaduro/termwind": "^1.15|^2.0"
     },
     "require-dev": {
-        "doctrine/dbal": "^3.0",
+        "doctrine/dbal": "^3.0|^4.0",
+        "larastan/larastan": "^1.0.0|^2.0",
         "laravel/pint": "^1.4",
-        "nunomaduro/larastan": "^1.0.0|^2.0",
-        "orchestra/testbench": "^6.23.2|^7.0|^8.0|^9.0",
-        "pestphp/pest": "^1.22|^2.34",
+        "orchestra/testbench": "^7.0|^8.0|^9.0",
+        "pestphp/pest": "^2.34",
         "pestphp/pest-plugin-laravel": "^1.2|^2.3",
-        "phpunit/phpunit": "^9.5.10|^10.5",
-        "psalm/plugin-laravel": "^1.6.2",
-        "rector/rector": "^0.14.6|^1.0",
-        "vimeo/psalm": "^4.11|^5.22"
+        "phpunit/phpunit": "^10.5",
+        "rector/rector": "^0.14|^1.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,5 @@
 includes:
-    - ./vendor/nunomaduro/larastan/extension.neon
+    - ./vendor/larastan/larastan/extension.neon
 parameters:
     reportUnmatchedIgnoredErrors: false
     ignoreErrors:

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
     <report>
       <clover outputFile="build/logs/clover.xml"/>
       <html outputDirectory="build/coverage"/>
@@ -21,4 +18,9 @@
   <php>
     <env name="DB_CONNECTION" value="testing"/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/phpunit.xml.dist.bak b/phpunit.xml.dist.bak
@@ -1,32 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" />
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
-    <php>
-        <env name="DB_CONNECTION" value="testing" />
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
+  <php>
+    <env name="DB_CONNECTION" value="testing"/>
+  </php>
 </phpunit>