Update for PHP 8.1

popphp · Oct 16, 2023 · 7322475 · 7322475
1 parent 0356d0a
commit 7322475
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 75 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -6,13 +6,16 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  XDEBUG_MODE: debug,coverage
+
 jobs:
   build:
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [ '7.4', '8.0' ]
+        php-versions: [ '8.1', '8.2' ]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
 composer.lock
 public
+script
 vendor
-
+kettle
+.phpunit.result.cache
+.phpunit.cache
diff --git a/LICENSE.TXT b/LICENSE.TXT
@@ -1,6 +1,6 @@
 BSD 3 Clause License
 
-Copyright (c) 2009-2023, NOLA Interactive, LLC.
+Copyright (c) 2009-2024, NOLA Interactive, LLC.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -8,22 +8,28 @@ Popcorn PHP Micro Framework
 
 RELEASE INFORMATION
 -------------------
-Popcorn PHP REST-Based Micro Framework 3.4.1  
-Released November 14, 2022 
+Popcorn PHP REST-Based Micro Framework 4.0.0  
+Released October 16, 2023 
 
 OVERVIEW
 --------
 Popcorn PHP Micro Framework is a REST-based micro framework.  It is a component of
 [Pop PHP Framework](http://www.popphp.org/). It is a small component that acts as
 a layer for [Pop PHP](https://github.com/popphp/popphp) to enforce the REST-based
-routing rules of a web application. It supports PHP 7.4+.
+routing rules of a web application. It supports PHP 8.1+.
 
 INSTALL
 -------
 Install `popcorn` using Composer.
 
     composer require popphp/popcorn
 
+Or, require it in your composer.json file
+
+    "require": {
+        "popphp/popcorn" : "^4.0.0"
+    }
+
 BASIC USAGE
 -----------
 In a simple `index.php` file, you can define the routes you want to allow

diff --git a/composer.json b/composer.json
@@ -16,14 +16,14 @@
         }
     ],
     "require": {
-        "php": ">=7.4.0",
-        "popphp/popphp": "^3.7.2",
-        "popphp/pop-http": "^4.2.0",
-        "popphp/pop-session": "^3.4.1",
-        "popphp/pop-view": "^3.3.1"
+        "php": ">=8.1.0",
+        "popphp/popphp": "^4.0.0",
+        "popphp/pop-http": "^5.0.0",
+        "popphp/pop-session": "^4.0.0",
+        "popphp/pop-view": "^4.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.0"
+        "phpunit/phpunit": "^10.0.0"
     },
     "suggest": {
         "popphp/pop-db": "For DB management and transactions",
@@ -44,7 +44,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.4.x-dev"
+            "dev-master": "4.0.x-dev"
         }
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -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" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage>
     <report>
       <html outputDirectory="/tmp/popcorn-cc" lowUpperBound="35" highLowerBound="70"/>
     </report>
@@ -14,4 +11,9 @@
     </testsuite>
   </testsuites>
   <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/Exception.php b/src/Exception.php
@@ -4,7 +4,7 @@
  *
  * @link       https://github.com/popphp/popcorn
  * @author     Nick Sagona, III <[email protected]>
- * @copyright  Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
+ * @copyright  Copyright (c) 2009-2024 NOLA Interactive, LLC. (http://www.nolainteractive.com)
  * @license    http://popcorn.popphp.org/license     New BSD License
  */
 
@@ -19,8 +19,8 @@
  * @category   Popcorn
  * @package    Popcorn
  * @author     Nick Sagona, III <[email protected]>
- * @copyright  Copyright (c) 2009-2023 NOLA Interactive, LLC. (http://www.nolainteractive.com)
+ * @copyright  Copyright (c) 2009-2024 NOLA Interactive, LLC. (http://www.nolainteractive.com)
  * @license    http://popcorn.popphp.org/license     New BSD License
- * @version    3.4.2
+ * @version    4.0.0
  */
 class Exception extends \Exception {}