Merge pull request #44 from laminas/3.5.x-merge-up-into-3.6.x_rJdgStH4

Merge release 3.5.2 into 3.6.x

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://github.com/laminas/laminas-test/workflows/Continuous%20Integration/badge.svg)](https://github.com/laminas/laminas-test/actions?query=workflow%3A"Continuous+Integration")
 
-laminas-test provides tools to facilitate unit testing of your Laminas
+laminas-test provides tools to facilitate integration testing of your Laminas
 Framework applications. At this time, we offer facilities to enable testing of
 your Laminas MVC applications. [PHPUnit](https://phpunit.de/) is the only
 library supported currently.

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "laminas/laminas-test",
-    "description": "Tools to facilitate unit testing of laminas-mvc applications",
+    "description": "Tools to facilitate integration testing of laminas-mvc applications",
     "license": "BSD-3-Clause",
     "keywords": [
         "laminas",

docs/book/assertions.md

@@ -1,6 +1,6 @@
 # Assertions
 
-Assertions are at the heart of unit testing; you use them to verify that the
+Assertions are at the heart of testing; you use them to verify that the
 results are what you expect. To this end, `Laminas\Test\PHPUnit\AbstractControllerTestCase`
 provides a number of assertions to make testing your MVC apps and controllers
 simpler.

docs/book/intro.md

@@ -1,6 +1,6 @@
 # Introduction
 
-laminas-test provides tools to facilitate unit testing of your
+laminas-test provides tools to facilitate integration testing of your
 [laminas-mvc](https://docs.laminas.dev/laminas-mvc/) applications.
 
 PHPUnit is the only library supported currently.

docs/book/phpunit.md

@@ -1,4 +1,4 @@
-# Unit testing with PHPUnit
+# Integration Testing with PHPUnit
 
 `Laminas\Test\PHPUnit` provides an abstract `TestCase` for laminas-mvc applications
 that contains assertions for testing against a variety of responsibilities.

mkdocs.yml

@@ -3,10 +3,10 @@ site_dir: docs/html
 nav:
     - Home: index.md
     - Introduction: intro.md
-    - "Unit testing with PHPUnit": phpunit.md
+    - "Integration testing with PHPUnit": phpunit.md
     - Assertions: assertions.md
 site_name: laminas-test
-site_description: laminas-test
+site_description: "Tools to facilitate integration testing of laminas-mvc applications"
 repo_url: 'https://github.com/laminas/laminas-test'
 extra:
     project: MVC

src/PHPUnit/Constraint/IsCurrentModuleNameConstraint.php

@@ -39,8 +39,9 @@ public function getCurrentModuleName(): string
         $applicationConfig = $this->getTestCase()->getApplicationConfig();
 
         // Find Module from Controller
+        /** @var string $appModules */
         foreach ($applicationConfig['modules'] as $appModules) {
-            if (strpos($controllerClass, $appModules) !== false) {
+            if (strpos($controllerClass, $appModules . '\\') !== false) {
                 if (strpos($appModules, '\\') !== false) {
                     $match = ltrim(substr($appModules, strrpos($appModules, '\\')), '\\');
                 } else {

test/PHPUnit/Controller/AbstractControllerTestCaseTest.php

@@ -24,6 +24,7 @@
 
 use function array_diff;
 use function array_key_exists;
+use function array_merge_recursive;
 use function count;
 use function extension_loaded;
 use function get_class;
@@ -192,6 +193,30 @@ public function testAssertModuleNameWithNamespace()
         $this->assertModuleName('TestModule');
     }
 
+    /** @return void */
+    public function testAssertModuleWithSimilarName()
+    {
+        $applicationConfig = $this->getApplicationConfig();
+
+        $testConfig = [
+            'modules'                 => [
+                'ModuleWithSimilarName\TestModule',
+                'ModuleWithSimilarName\Test',
+            ],
+            'module_listener_options' => [
+                'module_paths' => [
+                    'ModuleWithSimilarName\TestModule' => __DIR__ . '/../../_files/ModuleWithSimilarName/TestModule/',
+                    'ModuleWithSimilarName\Test'       => __DIR__ . '/../../_files/ModuleWithSimilarName/Test/',
+                ],
+            ],
+        ];
+
+        $this->setApplicationConfig(array_merge_recursive($testConfig, $applicationConfig));
+
+        $this->dispatch('/similar-name-2-test');
+        $this->assertModuleName('TestModule');
+    }
+
     /** @return void */
     public function testAssertExceptionDetailsPresentWhenTraceErrorIsEnabled()
     {

test/_files/ModuleWithSimilarName/Test/Module.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @see       https://github.com/laminas/laminas-test for the canonical source repository
+ */
+
+namespace ModuleWithSimilarName\Test;
+
+use Laminas\Loader\StandardAutoloader;
+
+class Module
+{
+    /**
+     * @psalm-return array<string, mixed>
+     */
+    public function getConfig(): array
+    {
+        return include __DIR__ . '/config/module.config.php';
+    }
+
+    /**
+     * @return string[][][]
+     * @psalm-return array<string, array<string, array<string, string>>>
+     */
+    public function getAutoloaderConfig(): array
+    {
+        return [
+            StandardAutoloader::class => [
+                'namespaces' => [
+                    __NAMESPACE__ => __DIR__ . '/src/',
+                ],
+            ],
+        ];
+    }
+}

test/_files/ModuleWithSimilarName/Test/config/module.config.php

@@ -0,0 +1,23 @@
+<?php
+
+return [
+    'router'      => [
+        'routes' => [
+            'similar_name_route' => [
+                'type'    => 'literal',
+                'options' => [
+                    'route'    => '/similar-name-test',
+                    'defaults' => [
+                        'controller' => 'similar_name_index',
+                        'action'     => 'unittests',
+                    ],
+                ],
+            ],
+        ],
+    ],
+    'controllers' => [
+        'invokables' => [
+            'similar_name_index' => 'ModuleWithSimilarName\Test\Controller\IndexController',
+        ],
+    ],
+];

test/_files/ModuleWithSimilarName/Test/src/Controller/IndexController.php

@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @see       https://github.com/laminas/laminas-test for the canonical source repository
+ */
+
+namespace ModuleWithSimilarName\Test\Controller;
+
+use Laminas\Mvc\Controller\AbstractActionController;
+
+class IndexController extends AbstractActionController
+{
+    public function unittestsAction(): string
+    {
+        return 'unittest';
+    }
+}

test/_files/ModuleWithSimilarName/TestModule/Module.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @see       https://github.com/laminas/laminas-test for the canonical source repository
+ */
+
+namespace ModuleWithSimilarName\TestModule;
+
+use Laminas\Loader\StandardAutoloader;
+
+class Module
+{
+    /**
+     * @psalm-return array<string, mixed>
+     */
+    public function getConfig(): array
+    {
+        return include __DIR__ . '/config/module.config.php';
+    }
+
+    /**
+     * @return string[][][]
+     * @psalm-return array<string, array<string, array<string, string>>>
+     */
+    public function getAutoloaderConfig(): array
+    {
+        return [
+            StandardAutoloader::class => [
+                'namespaces' => [
+                    __NAMESPACE__ => __DIR__ . '/src/',
+                ],
+            ],
+        ];
+    }
+}

test/_files/ModuleWithSimilarName/TestModule/config/module.config.php

@@ -0,0 +1,23 @@
+<?php
+
+return [
+    'router'      => [
+        'routes' => [
+            'similar_name_2_route' => [
+                'type'    => 'literal',
+                'options' => [
+                    'route'    => '/similar-name-2-test',
+                    'defaults' => [
+                        'controller' => 'similar_name_2_index',
+                        'action'     => 'unittests',
+                    ],
+                ],
+            ],
+        ],
+    ],
+    'controllers' => [
+        'invokables' => [
+            'similar_name_2_index' => 'ModuleWithSimilarName\TestModule\Controller\IndexController',
+        ],
+    ],
+];

test/_files/ModuleWithSimilarName/TestModule/src/Controller/IndexController.php

@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @see       https://github.com/laminas/laminas-test for the canonical source repository
+ */
+
+namespace ModuleWithSimilarName\TestModule\Controller;
+
+use Laminas\Mvc\Controller\AbstractActionController;
+
+class IndexController extends AbstractActionController
+{
+    public function unittestsAction(): string
+    {
+        return 'unittest';
+    }
+}