From 570ee5cc5a16a75fa985d3e758f49af581067bd7 Mon Sep 17 00:00:00 2001
From: Hill <hill@kimo.com>
Date: Fri, 24 Feb 2023 00:49:18 +0800
Subject: [PATCH] update php 8.2

---
 .circleci/config.yml                 | 12 ++++---
 .gitignore                           |  1 +
 README.md                            |  4 +--
 phpunit.xml                          | 49 +++++++++++++---------------
 tests/{test.php => ObserverTest.php} | 22 ++++++-------
 5 files changed, 45 insertions(+), 43 deletions(-)
 rename tests/{test.php => ObserverTest.php} (88%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cff2527..62bd9d6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,9 +30,13 @@ jobs:
           name: PHPUnit
           command: |
             ENABLE_COVERAGE=false
-            if [ "<< parameters.php-version >>" == "8.1" ] && [ "$ENABLE_COVERAGE" == "true" ]; then
-              XDEBUG_MODE=coverage phpunit --coverage-clover clover.xml
-              coveralls --coverage_clover=clover.xml -v -o coveralls-upload.json
+            if [ "<< parameters.php-version >>" == "8.2" ]; then
+              if [ "$ENABLE_COVERAGE" == "true" ]; then
+                XDEBUG_MODE=coverage phpunit --coverage-clover clover.xml
+                coveralls --coverage_clover=clover.xml -v -o coveralls-upload.json
+              else
+                phpunit --display-deprecations
+              fi
             else
               phpunit
             fi
@@ -47,4 +51,4 @@ workflows:
       - unittest:
           matrix:
             parameters:
-              php-version: ["8.1", "8.0",  "5.6"]
+              php-version: ["8.2", "8.1", "8.0",  "5.6"]
diff --git a/.gitignore b/.gitignore
index 721877b..cfc32f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ vendor
 composer.lock
 .php_cs.cache
 .phpunit.result.cache
+.phpunit.cache
 .*.sw?
diff --git a/README.md b/README.md
index 07d341c..ce24ec9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Latest Stable Version](https://poser.pugx.org/pmvc-plugin/dispatcher/v/stable)](https://packagist.org/packages/pmvc-plugin/dispatcher) 
 [![Latest Unstable Version](https://poser.pugx.org/pmvc-plugin/dispatcher/v/unstable)](https://packagist.org/packages/pmvc-plugin/dispatcher) 
-[![CircleCI](https://circleci.com/gh/pmvc-plugin/dispatcher/tree/master.svg?style=svg)](https://circleci.com/gh/pmvc-plugin/dispatcher/tree/master)
+[![CircleCI](https://circleci.com/gh/pmvc-plugin/dispatcher/tree/main.svg?style=svg)](https://circleci.com/gh/pmvc-plugin/dispatcher/tree/main)
 [![License](https://poser.pugx.org/pmvc-plugin/dispatcher/license)](https://packagist.org/packages/pmvc-plugin/dispatcher)
 [![Total Downloads](https://poser.pugx.org/pmvc-plugin/dispatcher/downloads)](https://packagist.org/packages/pmvc-plugin/dispatcher) 
 
@@ -19,7 +19,7 @@ PMVC Dispatcher / Observable Plugin
 ```
 {
     "require": {
-        "pmvc-plugin/dispatcher": "dev-master"
+        "pmvc-plugin/dispatcher": "dev-main"
     }
 }
 ```
diff --git a/phpunit.xml b/phpunit.xml
index 13d7302..e64af80 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,27 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         bootstrap="tests/include.php"
-         convertErrorsToExceptions="false"
-         convertNoticesToExceptions="false"
-         convertWarningsToExceptions="false"
-         processIsolation="false"
-         stopOnFailure="false"
-         >
-    <testsuites>
-        <testsuite name="Application Test Suite">
-            <directory>./tests/</directory>
-            <file>./tests/test.php</file>
-        </testsuite>
-    </testsuites>
-    <php>
-        <ini name="error_reporting" value="E_ALL"/>
-        <ini name="display_errors" value="true"/>
-        <ini name="display_startup_errors" value="true"/>
-        <env name="APP_ENV" value="testing"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
-    </php>
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpunit
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+  backupGlobals="false"
+  colors="true"
+  bootstrap="tests/include.php"
+  processIsolation="false"
+  stopOnFailure="false"
+  cacheDirectory=".phpunit.cache"
+  backupStaticProperties="false"
+>
+  <testsuites>
+    <testsuite name="Application Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <ini name="error_reporting" value="E_ALL" />
+    <ini name="display_errors" value="true" />
+    <ini name="display_startup_errors" value="true" />
+    <env name="APP_ENV" value="testing" />
+  </php>
 </phpunit>
diff --git a/tests/test.php b/tests/ObserverTest.php
similarity index 88%
rename from tests/test.php
rename to tests/ObserverTest.php
index c1a74af..500a245 100644
--- a/tests/test.php
+++ b/tests/ObserverTest.php
@@ -25,8 +25,8 @@ function testFireEvent()
         $event = 'Test';
         $dispatcher = PMVC\plug($this->_plug);
 
-        $mockObserver = $this->getMockBuilder(__NAMESPACE__.'\MockObserver')
-            ->setMethods(['on'.$event])
+        $mockObserver = $this->getPMVCMockBuilder(__NAMESPACE__.'\MockObserver')
+            ->pmvc_onlyMethods(['on'.$event])
             ->getMock();
         $mockObserver->expects($this->once())
            ->method('on'.$event);
@@ -39,8 +39,8 @@ public function testFireWithoutClean()
         $event = 'Test';
         $dispatcher = PMVC\plug($this->_plug);
 
-        $mockObserver = $this->getMockBuilder(__NAMESPACE__.'\MockObserver')
-            ->setMethods(['on'.$event])
+        $mockObserver = $this->getPMVCMockBuilder(__NAMESPACE__.'\MockObserver')
+            ->pmvc_onlyMethods(['on'.$event])
             ->getMock();
         $mockObserver->expects($this->once())
            ->method('on'.$event);
@@ -54,8 +54,8 @@ public function testFireWithClean()
         $event = 'Test';
         $dispatcher = PMVC\plug($this->_plug);
 
-        $mockObserver = $this->getMockBuilder(__NAMESPACE__.'\MockObserver')
-            ->setMethods(['on'.$event])
+        $mockObserver = $this->getPMVCMockBuilder(__NAMESPACE__.'\MockObserver')
+            ->pmvc_onlyMethods(['on'.$event])
             ->getMock();
         $mockObserver->expects($this->once())
            ->method('on'.$event);
@@ -68,8 +68,8 @@ function testFireEventBySetOption()
     {
         $key = 'foo';
         $dispatcher = PMVC\plug($this->_plug);
-        $mockObserver = $this->getMockBuilder(__NAMESPACE__.'\MockObserver')->
-            setMethods([
+        $mockObserver = $this->getPMVCMockBuilder(__NAMESPACE__.'\MockObserver')->
+            pmvc_onlyMethods([
                 'on'.$dispatcher->getOptionKey(),
                 'on'.$dispatcher->getOptionKey($key)
             ])->
@@ -87,8 +87,8 @@ function testAttachAfter()
     {
         $event = 'Test';
         $dispatcher = PMVC\plug($this->_plug);
-        $mockObserver = $this->getMockBuilder(__NAMESPACE__.'\MockObserver')
-            ->setMethods(['on'.$event])
+        $mockObserver = $this->getPMVCMockBuilder(__NAMESPACE__.'\MockObserver')
+            ->pmvc_onlyMethods(['on'.$event])
             ->getMock();
         $mockObserver->expects($this->once())
            ->method('on'.$event);
@@ -198,7 +198,7 @@ function onSetConfig()
 
     }
 
-    function onSetConfig__foo()
+    function onSetConfig_foo()
     {
 
     }