Fixes

RobiNN1 · Feb 17, 2024 · c615b86 · c615b86
1 parent 6fad270
commit c615b86
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
   "require-dev": {
     "gajus/dindent": "^2.0",
     "phpstan/phpstan": "^1.10",
-    "phpunit/phpunit": "^10.5"
+    "phpunit/phpunit": "^11.0"
   },
   "minimum-stability": "dev",
   "prefer-stable": true,

diff --git a/resources/fomanticui2/config.php b/resources/fomanticui2/config.php
@@ -127,8 +127,8 @@
     ],
     'carousel'     => [
         'files' => [
-            'css' => ['https://cdn.jsdelivr.net/npm/swiper@11.0.5/swiper-bundle.min.css'],
-            'js'  => ['https://cdn.jsdelivr.net/npm/swiper@11.0.5/swiper-bundle.min.js'],
+            'css' => ['https://cdn.jsdelivr.net/npm/swiper@11.0.6/swiper-bundle.min.css'],
+            'js'  => ['https://cdn.jsdelivr.net/npm/swiper@11.0.6/swiper-bundle.min.js'],
         ],
     ],
     'dropdown'     => [

diff --git a/src/UiKit.php b/src/UiKit.php
@@ -85,7 +85,7 @@ public function __construct(Config|array $config = []) {
      * @param Config|array<string, mixed> $config
      */
     public static function getInstance(Config|array $config = []): UiKit {
-        if (self::$instance === null) {
+        if (!self::$instance instanceof self) {
             self::$instance = new self($config);
         }
 

diff --git a/tests/Components/Form/CheckboxTestCase.php b/tests/Components/Form/CheckboxTestCase.php
@@ -12,6 +12,7 @@
 
 abstract class CheckboxTestCase extends ComponentTestCase {
     protected string $expected_tpl;
+
     protected string $expected_multiple_tpl;
 
     public function testCheckboxRender(): void {

diff --git a/tests/Components/Form/FormTestCase.php b/tests/Components/Form/FormTestCase.php
@@ -12,6 +12,7 @@
 
 abstract class FormTestCase extends ComponentTestCase {
     protected string $expected_open_tpl;
+
     protected string $expected_close_tpl;
 
     public function testOpenFormRender(): void {

diff --git a/tests/Components/Layout/ContainerTestCase.php b/tests/Components/Layout/ContainerTestCase.php
@@ -12,6 +12,7 @@
 
 abstract class ContainerTestCase extends ComponentTestCase {
     protected string $expected_open_tpl;
+
     protected string $expected_close_tpl;
 
     public function testOpenContainerRender(): void {

diff --git a/tests/Components/Layout/GridTestCase.php b/tests/Components/Layout/GridTestCase.php
@@ -12,10 +12,15 @@
 
 abstract class GridTestCase extends ComponentTestCase {
     protected string $expected_open_tpl;
+
     protected string $expected_close_tpl;
+
     protected string $expected_100_50_tpl;
+
     protected string $expected_fw_tpl;
+
     protected string $expected_auto_tpl;
+
     protected string $expected_auto_multiple_tpl;
 
     /**

diff --git a/tests/Components/Layout/LayoutTestCase.php b/tests/Components/Layout/LayoutTestCase.php
@@ -15,6 +15,7 @@
 
 abstract class LayoutTestCase extends ComponentTestCase {
     protected string $expected_tpl;
+
     protected string $expected_framework;
 
     protected function setUp(string $framework = ''): void {

diff --git a/tests/Components/Layout/RowTestCase.php b/tests/Components/Layout/RowTestCase.php
@@ -12,6 +12,7 @@
 
 abstract class RowTestCase extends ComponentTestCase {
     protected string $expected_open_tpl;
+
     protected string $expected_close_tpl;
 
     public function testOpenRowRender(): void {

diff --git a/tests/CustomComponets/TestTwigTest.php b/tests/CustomComponets/TestTwigTest.php
@@ -11,7 +11,7 @@
 use RobiNN\UiKit\Tests\ComponentTestCase;
 
 final class TestTwigTest extends ComponentTestCase {
-    protected string $expected_tpl;
+    private string $expected_tpl;
 
     protected function setUp(): void {
         parent::setUp();