ostark · ostark · Jul 12, 2022 · Jul 12, 2022 · Jul 12, 2022
diff --git a/.gitignore b/.gitignore
@@ -1,33 +1,11 @@
-# CRAFT ENVIRONMENT
-.env.php
-.env.sh
-.env
-
-# COMPOSER
-/vendor
+.idea
+.php_cs
+.php_cs.cache
+.php-cs-fixer.cache
+.phpunit.result.cache
+/build
 composer.lock
+vendor
+*.log
+/tests/_craft/storage/
 
-# BUILD FILES
-/bower_components/*
-/node_modules/*
-/build/*
-/yarn-error.log
-
-# MISC FILES
-.cache
-.DS_Store
-.idea
-.project
-.settings
-*.esproj
-*.sublime-workspace
-*.sublime-project
-*.tmproj
-*.tmproject
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-config.codekit3
-prepros-6.config
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [2.0.0] - Unreleased
+
+
+
 ## [1.9.2] - 2022-03-26
 - Fix issues with Supertable / exclude SuperTableBlockElement
 

diff --git a/composer.json b/composer.json
@@ -24,26 +24,43 @@
     }
   ],
   "require": {
-    "craftcms/cms": "^3.2.0",
+    "craftcms/cms": "^4.1.0",
     "guzzlehttp/guzzle": "^6.5.5|^7.2.0"
   },
   "require-dev": {
-    "vimeo/psalm": "^4.4"
+    "craftcms/phpstan": "*",
+    "friendsofphp/php-cs-fixer": "^3.0",
+    "pestphp/pest": "^1.2",
+    "pestphp/pest-plugin-parallel": "^1.0"
   },
   "autoload": {
     "psr-4": {
-      "ostark\\upper\\": "src/"
-    }
+      "ostark\\Upper\\": "src/"
+    },
+    "files": [
+      "src/helpers.php"
+    ]
   },
   "scripts": {
-    "ps": "phpstan analyse src --level=5 -c phpstan.neon",
-    "stan": "@ps"
+    "phpstan": "vendor/bin/phpstan analyse",
+    "test": "vendor/bin/pest"
   },
   "extra": {
     "name": "Upper",
     "handle": "upper",
     "hasCpSettings": false,
     "hasCpSection": false,
     "changelogUrl": "https://raw.githubusercontent.com/ostark/upper/master/CHANGELOG.md"
-  }
+  },
+  "config": {
+    "allow-plugins": {
+      "yiisoft/yii2-composer": true,
+      "composer/package-versions-deprecated": true,
+      "craftcms/plugin-installer": true,
+      "pestphp/pest-plugin": true
+    }
+  },
+
+  "prefer-stable": true,
+  "minimum-stability": "dev"
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,11 @@
+includes:
+    - vendor/craftcms/phpstan/phpstan.neon
+parameters:
+    level: 6
+    paths:
+        - src
+        - tests
+    tmpDir: build/phpstan
+    checkMissingIterableValueType: false
+    ignoreErrors:
+        - "#Unable to resolve the template type T in call to method static method#"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    bootstrap="tests/bootstrap.php"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="false"
+    failOnWarning="true"
+    failOnRisky="true"
+    failOnEmptyTestSuite="true"
+    beStrictAboutOutputDuringTests="true"
+    verbose="true"
+>
+    <testsuites>
+        <testsuite name="Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <coverage>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <report>
+            <html outputDirectory="build/test/coverage"/>
+            <text outputFile="build/test/coverage.txt"/>
+            <clover outputFile="build/test/logs/clover.xml"/>
+        </report>
+    </coverage>
+    <logging>
+        <junit outputFile="build/test/report.junit.xml"/>
+    </logging>
+</phpunit>
diff --git a/psalm.xml b/psalm.xml
diff --git a/src/CacheResponse.php b/src/CacheResponse.php
@@ -1,11 +1,11 @@
-<?php namespace ostark\upper;
+<?php namespace ostark\Upper;
 
 use yii\base\Response;
 
 class CacheResponse
 {
     /**
-     * @var \yii\base\Response|\ostark\upper\behaviors\CacheControlBehavior
+     * @var \yii\base\Response|\ostark\Upper\behaviors\CacheControlBehavior
      */
     public $response;
 

diff --git a/src/drivers/AbstractPurger.php → src/Drivers/AbstractPurger.php b/src/drivers/AbstractPurger.php → src/Drivers/AbstractPurger.php
@@ -1,14 +1,14 @@
-<?php namespace ostark\upper\drivers;
+<?php namespace ostark\Upper\Drivers;
 
-use ostark\upper\Plugin;
+use ostark\Upper\Plugin;
 use yii\base\BaseObject;
 use yii\db\Exception;
 use yii\helpers\ArrayHelper;
 
 /**
  * Class AbstractPurger Driver
  *
- * @package ostark\upper\drivers
+ * @package ostark\Upper\Drivers
  */
 class AbstractPurger extends BaseObject
 {

diff --git a/src/drivers/CachePurgeInterface.php → src/Drivers/CachePurgeInterface.php b/src/drivers/CachePurgeInterface.php → src/Drivers/CachePurgeInterface.php
@@ -1,10 +1,10 @@
-<?php namespace ostark\upper\drivers;
+<?php namespace ostark\Upper\Drivers;
 
 
 /**
  * Interface CachePurgeInterface
  *
- * @package ostark\upper\drivers
+ * @package ostark\Upper\Drivers
  */
 interface CachePurgeInterface
 {

diff --git a/src/drivers/Cloudflare.php → src/Drivers/Cloudflare.php b/src/drivers/Cloudflare.php → src/Drivers/Cloudflare.php
@@ -1,14 +1,14 @@
-<?php namespace ostark\upper\drivers;
+<?php namespace ostark\Upper\Drivers;
 
 use Craft;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\BadResponseException;
-use ostark\upper\exceptions\CloudflareApiException;
+use ostark\Upper\Exceptions\CloudflareApiException;
 
 /**
  * Class Cloudflare Driver
  *
- * @package ostark\upper\drivers
+ * @package ostark\Upper\Drivers
  */
 class Cloudflare extends AbstractPurger implements CachePurgeInterface
 {
@@ -51,7 +51,7 @@ public function purgeTag(string $tag)
      * @param array $urls
      *
      * @return bool
-     * @throws \ostark\upper\exceptions\CloudflareApiException
+     * @throws \ostark\Upper\exceptions\CloudflareApiException
      */
     public function purgeUrls(array $urls)
     {
@@ -99,7 +99,7 @@ public function purgeAll()
      * @param array  $params
      *
      * @return bool
-     * @throws \ostark\upper\exceptions\CloudflareApiException
+     * @throws \ostark\Upper\exceptions\CloudflareApiException
      */
     protected function sendRequest($method = 'DELETE', string $type, array $params = [])
     {

diff --git a/src/drivers/Dummy.php → src/Drivers/Dummy.php b/src/drivers/Dummy.php → src/Drivers/Dummy.php
@@ -1,9 +1,9 @@
-<?php namespace ostark\upper\drivers;
+<?php namespace ostark\Upper\Drivers;
 
 /**
  * Class Dummy Driver
  *
- * @package ostark\upper\drivers
+ * @package ostark\Upper\Drivers
  */
 class Dummy extends AbstractPurger implements CachePurgeInterface
 {

diff --git a/src/drivers/Fastly.php → src/Drivers/Fastly.php b/src/drivers/Fastly.php → src/Drivers/Fastly.php
@@ -1,8 +1,8 @@
-<?php namespace ostark\upper\drivers;
+<?php namespace ostark\Upper\Drivers;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\BadResponseException;
-use ostark\upper\exceptions\FastlyApiException;
+use ostark\Upper\Exceptions\FastlyApiException;
 
 /**
  * Class Keycdn Driver
@@ -19,7 +19,7 @@
  * PURGE https://www.example.com/example/uri HTTP/1.1
  * Fastly-Key:{$apiToken}
  *
- * @package ostark\upper\drivers
+ * @package ostark\Upper\Drivers
  *
  */
 class Fastly extends AbstractPurger implements CachePurgeInterface
@@ -109,7 +109,7 @@ public function purgeAll()
      * @param array  $headers
      *
      * @return bool
-     * @throws \ostark\upper\exceptions\FastlyApiException
+     * @throws \ostark\Upper\exceptions\FastlyApiException
      */
     protected function sendRequest(string $method = 'PURGE', string $uri, array $headers = [])
     {

diff --git a/src/drivers/Keycdn.php → src/Drivers/Keycdn.php b/src/drivers/Keycdn.php → src/Drivers/Keycdn.php
@@ -1,13 +1,13 @@
-<?php namespace ostark\upper\drivers;
+<?php namespace ostark\Upper\Drivers;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\BadResponseException;
-use ostark\upper\exceptions\KeycdnApiException;
+use ostark\Upper\Exceptions\KeycdnApiException;
 
 /**
  * Class Keycdn Driver
  *
- * @package ostark\upper\drivers
+ * @package ostark\Upper\Drivers
  */
 class Keycdn extends AbstractPurger implements CachePurgeInterface
 {
@@ -70,7 +70,7 @@ public function purgeAll()
      * @param array  $params
      *
      * @return bool
-     * @throws \ostark\upper\exceptions\KeycdnApiException
+     * @throws \ostark\Upper\exceptions\KeycdnApiException
      */
     protected function sendRequest($method = 'DELETE', string $type, array $params = [])
     {

diff --git a/src/drivers/Varnish.php → src/Drivers/Varnish.php b/src/drivers/Varnish.php → src/Drivers/Varnish.php
@@ -1,4 +1,4 @@
-<?php namespace ostark\upper\drivers;
+<?php namespace ostark\Upper\Drivers;
 
 use Craft;
 use GuzzleHttp\Client;
@@ -7,7 +7,7 @@
 /**
  * Class Varnish Driver
  *
- * @package ostark\upper\drivers
+ * @package ostark\Upper\Drivers
  */
 class Varnish extends AbstractPurger implements CachePurgeInterface
 {