🎨 travis, phpunit, php-cs-fixer

Signed-off-by: Bruno Meilick <[email protected]>

.php_cs.dist → .php-cs-fixer.dist.php

@@ -1,14 +1,19 @@
 <?php
 
+
 $finder = PhpCsFixer\Finder::create()
-    ->exclude('vendor')
+    ->exclude('content')
     ->exclude('kirby')
+    ->exclude('node_modules')
+    //->exclude('site/plugins')
+    ->exclude('src')
+    ->exclude('vendor')
     ->in(__DIR__)
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@PSR2' => true,
     ])
     ->setFinder($finder)
-;
+;

.travis.yml

@@ -1,5 +1,5 @@
 language: php
-php: 7.2
+php: 7.3
 matrix:
   fast_finish: true
 install: composer install --no-interaction

classes/Bnomei/Srcset.php

@@ -182,7 +182,7 @@ public function imageKirbytagFromData(array $data = []): string
         $text = kirby()->kirbytags($text, $data);
         if (!A::get($data, 'figure')) {
             // <figure> </figure> and <figure class="" ...> </figure>
-            $text = preg_replace('/<(\/?)(figure[^>]*)>/',  '', $text);
+            $text = preg_replace('/<(\/?)(figure[^>]*)>/', '', $text);
         }
         return $text;
     }

classes/Kirby/Editor/SrcsetBlock.php

@@ -5,9 +5,9 @@
 use Throwable;
 
 $foundEditor = false;
-foreach([realpath(__DIR__ . '/../../../../'), realpath(__DIR__ . '/../../../tests/site/plugins/')] as $dir) {
-    if (is_dir( $dir . '/editor')) {
-        foreach(['Block', 'Blocks'] as $lib) {
+foreach ([realpath(__DIR__ . '/../../../../'), realpath(__DIR__ . '/../../../tests/site/plugins/')] as $dir) {
+    if (is_dir($dir . '/editor')) {
+        foreach (['Block', 'Blocks'] as $lib) {
             if (! class_exists("Kirby\Editor\{$lib}")) {
                 load([
                     "Kirby\\Editor\\{$lib}" => $dir . "/editor/lib/{$lib}.php",
@@ -20,7 +20,9 @@
 }
 
 if (! $foundEditor) {
-    class Block {}
+    class Block
+    {
+    }
 }
 
 // TODO: no coverage since no real tests

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "bnomei/kirby3-srcset",
   "type": "kirby-plugin",
-  "version": "3.3.11",
+  "version": "3.3.12",
   "license": "MIT",
   "description": "Kirby 3 Plugin for creating lazyloading image srcset",
   "authors": [
@@ -41,20 +41,19 @@
   },
   "require": {
     "php": ">=7.2.0",
-    "getkirby/composer-installer": "^1.1"
+    "getkirby/composer-installer": "^1.2"
   },
   "require-dev": {
-    "phpunit/phpunit": "^8.3",
-    "getkirby/cms": "^3.2",
+    "getkirby/cms": "^3.5",
     "php-coveralls/php-coveralls": "^2.1",
-    "nunomaduro/phpinsights": "^1.8"
+    "phpunit/phpunit": "^9.5"
   },
   "scripts": {
     "analyze": "phpstan analyse classes",
-    "insights": "./vendor/bin/phpinsights -v",
     "fix": "php-cs-fixer fix",
     "test": [
       "mkdir -p tests/logs",
+      "@putenv XDEBUG_MODE=coverage",
       "phpunit --configuration ./phpunit.xml"
     ],
     "dist": [