Support PHP 74 and PHPunit 9

judmir.karriqi · llupa · commit 871781d3fbc2 · 2021-01-26T18:01:40.000+01:00
- Replace abandoned zendframework zend-json with laminas/laminas-json
diff --git a/Form/Type/CodeMirrorType.php b/Form/Type/CodeMirrorType.php
@@ -29,7 +29,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     }
 
     /**
-     * {@inheritdoc}
+     * Keep this to use same widget.
+     *
+     * @return string
      */
     public function configureOptions(OptionsResolver $resolver)
     {
@@ -40,6 +42,18 @@ public function configureOptions(OptionsResolver $resolver)
         );
     }
 
+    /**
+     * @param OptionsResolver $resolver
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(
+            array(
+                'parameters' => array(),
+            )
+        );
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/Tests/App/config_test.yml b/Tests/App/config_test.yml
@@ -10,13 +10,12 @@ framework:
     validation:      { enable_annotations: true }
     templating:      { engines: ['twig'] } #assets_version: SomeVersionScheme
     default_locale:  en
-    trust_proxy_headers: false # Whether or not the Request object should trust proxy headers (X_FORWARDED_FOR/HTTP_CLIENT_IP)
+    trusted_proxies: [false] # Whether or not the Request object should trust proxy headers (X_FORWARDED_FOR/HTTP_CLIENT_IP)
     session:         ~
 # Twig Configuration
 twig:
-    form:
-        resources:
-            - 'SolutionCodeMirrorBundle:Form:code_mirror_widget.html.twig'
+    form_themes:
+        - 'SolutionCodeMirrorBundle:Form:code_mirror_widget.html.twig'
 
 # Assetic Configuration
 assetic:
@@ -34,6 +33,6 @@ solution_code_mirror:
       lineNumbers: true
       lineWrapping: true
     mode_dirs:
-     - @SolutionCodeMirrorBundle/Tests/App/dummy_js
+     - "@SolutionCodeMirrorBundle/Tests/App/dummy_js"
     themes_dirs:
-     - @SolutionCodeMirrorBundle/Tests/App/dummy_js
+     - "@SolutionCodeMirrorBundle/Tests/App/dummy_js"
diff --git a/Tests/AssetTest.php b/Tests/AssetTest.php
@@ -8,7 +8,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Solution\CodeMirrorBundle\Tests\App\AppKernel;
 
-class AssertTest extends WebTestCase
+class AssetTest extends WebTestCase
 {
     /**
      * @var AssetManager
@@ -18,7 +18,7 @@ class AssertTest extends WebTestCase
     /** @var  ContainerInterface */
     protected $container;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         self::$kernel = new AppKernel('test', true);
         static::$kernel->boot();
@@ -86,4 +86,4 @@ public function testTheme()
     }
 
 
-}
+}
diff --git a/Tests/TwigExtensionTest.php b/Tests/TwigExtensionTest.php
@@ -13,7 +13,7 @@ class TwigExtensionTest extends WebTestCase
 {
     protected $extension;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         self::$kernel = new AppKernel('test', true);
         static::$kernel->boot();
@@ -43,7 +43,7 @@ public function testIsFirstCallByDefault()
      */
     public function testRenderParameters($parameters, $return)
     {
-        $this->assertEquals($return, $this->extension->parametersRender($parameters));
+        $this->assertJsonStringEqualsJsonString((string) $return, (string) $this->extension->parametersRender($parameters));
     }
 
     /**
@@ -77,4 +77,4 @@ static public function  dataForRenderParameters()
     }
 
 
-}
+}
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 
 if (file_exists($file = __DIR__.'/../vendor/autoload.php')) {
-    $autoload = require_once $file;
+    $autoload = require $file;
 } else {
     throw new RuntimeException('Install dependencies to run test suite.');
 }
@@ -16,4 +16,4 @@
 
         return true;
     }
-});
+});
diff --git a/Twig/CodeMirrorExtension.php b/Twig/CodeMirrorExtension.php
@@ -1,11 +1,12 @@
 <?php
 namespace Solution\CodeMirrorBundle\Twig;
 
-use Zend\Json\Json;
-use Zend\Json\Expr;
+use Laminas\Json\Expr;
+use Laminas\Json\Json;
 
 use Assetic\AssetManager;
 use Assetic\Asset\FileAsset;
+use Twig\TwigFunction;
 
 class CodeMirrorExtension extends \Twig_Extension
 {
@@ -24,10 +25,10 @@ function __construct($assetManager)
     public function getFunctions()
     {
         return array(
-            new \Twig_SimpleFunction('code_mirror_parameters_render', array($this, 'parametersRender'), array('is_safe' => array('html'))),
-            new \Twig_SimpleFunction('code_mirror_is_first_call', array($this, 'isFirstCall')),
-            new \Twig_SimpleFunction('code_mirror_get_js_mode', array($this, 'code_mirror_get_js_mode')),
-            new \Twig_SimpleFunction('code_mirror_get_css_theme', array($this, 'code_mirror_get_css_theme')),
+            new TwigFunction('code_mirror_parameters_render', array($this, 'parametersRender'), array('is_safe' => array('html'))),
+            new TwigFunction('code_mirror_is_first_call', array($this, 'isFirstCall')),
+            new TwigFunction('code_mirror_get_js_mode', array($this, 'code_mirror_get_js_mode')),
+            new TwigFunction('code_mirror_get_css_theme', array($this, 'code_mirror_get_css_theme')),
         );
     }
 
@@ -36,7 +37,7 @@ public function parametersRender($paramters)
         if (isset($paramters['mode'])) {
             $paramters['mode'] = new Expr('"' . $paramters['mode'] . '"');
         }
-        $params = Json::encode($paramters, false, array('enableJsonExprFinder' => true));
+        $params = Json::encode($paramters, false, ['enableJsonExprFinder' => true]);
 
         $this->isFirstCall = false;
 
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "symfony/symfony": "~3.4",
         "twig/twig": "*",
         "symfony/assetic-bundle": "*",
-        "zendframework/zend-json": "2.0.*"
+        "laminas/laminas-json": "^3.1@dev"
     },
     "minimum-stability": "dev",
     "autoload": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,25 +2,25 @@
 
 <!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit colors = "true" bootstrap = "./Tests/bootstrap.php" >
-    <testsuites>
-        <testsuite name="CodeMirror Test Suite">
-            <directory suffix="Test.php">./Tests</directory>
-        </testsuite>
-    </testsuites>
-    <!--
-    <php>
-        <server name="KERNEL_DIR" value="/path/to/your/app/" />
-    </php>
-    -->
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./DependencyInjection</directory>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
+  <testsuites>
+    <testsuite name="CodeMirror Test Suite">
+      <directory suffix="Test.php">./Tests</directory>
+    </testsuite>
+  </testsuites>
+  <!--
+  <php>
+      <server name="KERNEL_DIR" value="/path/to/your/app/" />
+  </php>
+  -->
+  <filter>
+    <whitelist>
+      <directory>./</directory>
+      <exclude>
+        <directory>./DependencyInjection</directory>
+        <directory>./Resources</directory>
+        <directory>./Tests</directory>
+        <directory>./vendor</directory>
+      </exclude>
+    </whitelist>
+  </filter>
+</phpunit>

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use Symfony\Component\DependencyInjection\ContainerInterface;`
`9`	`9`	`use Solution\CodeMirrorBundle\Tests\App\AppKernel;`
`10`	`10`
`11`		`-class AssertTest extends WebTestCase`
	`11`	`+class AssetTest extends WebTestCase`
`12`	`12`	`{`
`13`	`13`	`/**`
`14`	`14`	`* @var AssetManager`
`@@ -18,7 +18,7 @@ class AssertTest extends WebTestCase`
`18`	`18`	`/** @var ContainerInterface */`
`19`	`19`	`protected $container;`
`20`	`20`
`21`		`- protected function setUp()`
	`21`	`+ protected function setUp(): void`
`22`	`22`	`{`
`23`	`23`	`self::$kernel = new AppKernel('test', true);`
`24`	`24`	`static::$kernel->boot();`
`@@ -86,4 +86,4 @@ public function testTheme()`
`86`	`86`	`}`
`87`	`87`
`88`	`88`
`89`		`-}`
	`89`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class TwigExtensionTest extends WebTestCase`
`13`	`13`	`{`
`14`	`14`	`protected $extension;`
`15`	`15`
`16`		`- protected function setUp()`
	`16`	`+ protected function setUp(): void`
`17`	`17`	`{`
`18`	`18`	`self::$kernel = new AppKernel('test', true);`
`19`	`19`	`static::$kernel->boot();`
`@@ -43,7 +43,7 @@ public function testIsFirstCallByDefault()`
`43`	`43`	`*/`
`44`	`44`	`public function testRenderParameters($parameters, $return)`
`45`	`45`	`{`
`46`		`- $this->assertEquals($return, $this->extension->parametersRender($parameters));`
	`46`	`+ $this->assertJsonStringEqualsJsonString((string) $return, (string) $this->extension->parametersRender($parameters));`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
`@@ -77,4 +77,4 @@ static public function dataForRenderParameters()`
`77`	`77`	`}`
`78`	`78`
`79`	`79`
`80`		`-}`
	`80`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`if (file_exists($file = __DIR__.'/../vendor/autoload.php')) {`
`4`		`- $autoload = require_once $file;`
	`4`	`+ $autoload = require $file;`
`5`	`5`	`} else {`
`6`	`6`	`throw new RuntimeException('Install dependencies to run test suite.');`
`7`	`7`	`}`
`@@ -16,4 +16,4 @@`
`16`	`16`
`17`	`17`	`return true;`
`18`	`18`	`}`
`19`		`-});`
	`19`	`+});`