chore(deps-dev): bump typescript

Bumps the dev-dependencies group in /website with 1 update: [typescript](https://github.com/Microsoft/TypeScript). Updates `typescript` from 5.5.2 to 5.5.3 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](microsoft/TypeScript@v5.5.2...v5.5.3) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Emilien Escalle <[email protected]>
neilime · Jul 16, 2024 · db90b9e · db90b9e
1 parent b104a58
commit db90b9e
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 12 deletions.
diff --git a/.github/workflows/__shared-ci.yml b/.github/workflows/__shared-ci.yml
@@ -43,6 +43,7 @@ jobs:
         uses: codecov/codecov-action@v4
         with:
           file: ./build/logs/clover.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   build-website:
     name: Check that website is building without errors

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -16,4 +16,5 @@
     ])
     ->setFinder($finder)
     ->setUsingCache(true)
-    ->setCacheFile(__DIR__ . '/tools/cache/.php-cs-fixer.cache');
+    ->setCacheFile(__DIR__ . '/tools/cache/.php-cs-fixer.cache')
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect());
diff --git a/src/TwbsHelper/Form/View/Helper/FormButton.php b/src/TwbsHelper/Form/View/Helper/FormButton.php
@@ -115,10 +115,6 @@ protected function prepareElementAttributes(\Laminas\Form\ElementInterface $elem
 
     protected function prepareElementClassAttributes(\Laminas\Form\ElementInterface $element)
     {
-        if ($element->getOption('disable_twbs')) {
-            return;
-        }
-
         if ($element->getOption('close')) {
             return;
         }

diff --git a/tests/TestSuite/Documentation/Tests/__snapshots__/Forms/Validation/Custom_styles__1.html b/tests/TestSuite/Documentation/Tests/__snapshots__/Forms/Validation/Custom_styles__1.html
@@ -1,4 +1,4 @@
-<form class="needs-validation" id="form" method="POST" name="form" novalidate="1" role="form">
+<form class="needs-validation" id="form" method="POST" name="form" novalidate="novalidate" role="form">
     <div class="g-3 row">
         <div class="col-md-4">
             <label class="form-label" for="validationCustom01">First name</label>

diff --git a/tests/TestSuite/Documentation/Tests/__snapshots__/Forms/Validation/Tooltips__1.html b/tests/TestSuite/Documentation/Tests/__snapshots__/Forms/Validation/Tooltips__1.html
@@ -1,4 +1,4 @@
-<form class="needs-validation" id="form" method="POST" name="form" novalidate="1" role="form">
+<form class="needs-validation" id="form" method="POST" name="form" novalidate="novalidate" role="form">
     <div class="g-3 row">
         <div class="col-md-4 position-relative">
             <label class="form-label" for="validationTooltip01">First name</label>

diff --git a/tests/TestSuite/TwbsHelper/AbstractViewHelperTestCase.php b/tests/TestSuite/TwbsHelper/AbstractViewHelperTestCase.php
@@ -19,9 +19,12 @@ protected function setUp(): void
         }
 
         $viewHelperPluginManager = \TestSuite\Bootstrap::getServiceManager()->get('ViewHelperManager');
+        $resolver = \TestSuite\Bootstrap::getServiceManager()->get('ViewResolver');
         $phpRenderer = new \Laminas\View\Renderer\PhpRenderer();
-        $phpRenderer->setHelperPluginManager($viewHelperPluginManager);
+        $phpRenderer
+            ->setResolver($resolver)
+            ->setHelperPluginManager($viewHelperPluginManager);
 
-        $this->helper = $phpRenderer->getHelperPluginManager()->get($this->helper);
+        $this->helper = $phpRenderer->getHelperPluginManager()->get($this->helper, ['test' => 'test']);
     }
 }
diff --git a/tests/TestSuite/TwbsHelper/Form/View/Helper/FormRowTest.php b/tests/TestSuite/TwbsHelper/Form/View/Helper/FormRowTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace TestSuite\TwbsHelper\Form\View\Helper;
+
+class FormRowTest extends \TestSuite\TwbsHelper\AbstractViewHelperTestCase
+{
+    /**
+     * @var \TwbsHelper\Form\View\Helper\FormRow
+     */
+    protected $helper = 'formRow';
+
+    public function testRenderWithPartial()
+    {
+        $factory = new \Laminas\Form\Factory();
+
+        $form = $factory->create([
+            'type' => 'form',
+            'elements' => [
+                [
+                    'spec' => [
+                        'name' => 'test',
+                    ],
+                ],
+            ],
+        ]);
+
+        $this->assertEquals(
+            '{"element":{},"label":null,"labelAttributes":[],"labelPosition":"prepend","renderErrors":true}',
+            $this->helper->__invoke(
+                $form,
+                null,
+                null,
+                'test/json'
+            )
+        );
+    }
+}
diff --git a/tests/config/module-config.php b/tests/config/module-config.php
@@ -3,6 +3,9 @@
 return [
     'view_manager' => [
         'doctype' => \Laminas\View\Helper\Doctype::XHTML5,
+        'template_map' => [
+            'test/json' => __DIR__ . '/../view/test/json.phtml',
+        ],
     ],
     'router' => [
         'router_class' => \Laminas\Router\Http\TreeRouteStack::class,

diff --git a/tests/view/test/json.phtml b/tests/view/test/json.phtml
@@ -0,0 +1,7 @@
+<?= $this->json([
+    'element'         => $this->element,
+    'label'           => $this->label,
+    'labelAttributes' => $this->labelAttributes,
+    'labelPosition'   => $this->labelPosition,
+    'renderErrors'    => $this->renderErrors,
+]) ?>
diff --git a/website/yarn.lock b/website/yarn.lock
@@ -8254,9 +8254,9 @@ typedarray-to-buffer@^3.1.5:
     is-typedarray "^1.0.0"
 
 typescript@^5.2.2:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507"
-  integrity sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.3.tgz#e1b0a3c394190838a0b168e771b0ad56a0af0faa"
+  integrity sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
-Original file line number
+Diff line change
@@ Expand Up @@
         protected function prepareElementClassAttributes(\Laminas\Form\ElementInterface $element)
         {
-            if ($element->getOption('disable_twbs')) {
-                return;
-            }
             if ($element->getOption('close')) {
                 return;
             }
@@ Expand Down @@