Support for Lumen 6.0

.gitignore

@@ -1,4 +1,5 @@
 .idea
+.phpunit.result.cache
 /tests/config
 /tests/public
 /tests/resources

README.md

@@ -21,7 +21,7 @@ Installation
  5.4.x      | 3         | 2.0                        | ``` composer require "darkaonline/swagger-lume:~3.0" ```
  5.5.x      | 3         | 2.0                        | ``` composer require "darkaonline/swagger-lume:5.5.*" ```
  5.6 - 5.7  | 3         | 2.0, 3.0                   | ``` composer require "darkaonline/swagger-lume:5.6.*" ```
-
+ 6.0        | 3         | 2.0, 3.0                   | ``` composer require "darkaonline/swagger-lume:6.*" ```
 
 - Open your `bootstrap/app.php` file and:
 

composer.json

@@ -10,15 +10,15 @@
     }
   ],
   "require": {
-    "php": ">=7.1.3",
-    "laravel/lumen-framework": "~5.6",
+    "php": ">=7.2",
+    "laravel/lumen-framework": "~6.0",
     "zircote/swagger-php": "~2.0|3.*",
     "swagger-api/swagger-ui": "^3.0"
   },
   "require-dev": {
-    "fzaninotto/faker": "~1.4",
-    "phpunit/phpunit": "~7.0",
-    "mockery/mockery": "~1.0",
+    "fzaninotto/faker": "~1.8",
+    "phpunit/phpunit": "8.*",
+    "mockery/mockery": "1.*",
     "satooshi/php-coveralls": "^2.0",
     "vlucas/phpdotenv": "~3.3"
   },

phpunit.xml

@@ -7,8 +7,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false">
+         stopOnFailure="false">
     <testsuite name="SwaggerLume TestSuite">
         <directory>tests/</directory>
     </testsuite>
@@ -18,12 +17,10 @@
         </whitelist>
     </filter>
     <logging>
-        <log type="coverage-html" target="./tests/storage/logs/test-reports" charset="UTF-8"
-             yui="true" highlight="true"
-             lowUpperBound="50" highLowerBound="80" />
+        <log type="coverage-html" target="./tests/storage/logs/test-reports" lowUpperBound="50" highLowerBound="80" />
         <log type="coverage-clover" target="./tests/storage/logs/test-reports/clover.xml"/>
         <log type="coverage-php" target="./tests/storage/logs/test-reports/coverage.cov"/>
-        <log type="junit" target="./tests/storage/logs/test-reports/junit.xml" logIncompleteSkipped="false"/>
+        <log type="junit" target="./tests/storage/logs/test-reports/junit.xml"/>
     </logging>
     <php>
         <env name="APP_ENV" value="testing"/>

tests/CommandsTest.php

@@ -24,11 +24,11 @@ public function canGenerateJsonDocumentation()
         $fileContent = file_get_contents($this->jsonDocsFile());
 
         $this->assertJson($fileContent);
-        $this->assertContains('SwaggerLume', $fileContent);
+        $this->assertStringContainsString('SwaggerLume', $fileContent);
 
         //Check if constants are replaced
-        $this->assertContains('http://my-default-host.com', $fileContent);
-        $this->assertNotContains('SWAGGER_LUME_CONST_HOST', $fileContent);
+        $this->assertStringContainsString('http://my-default-host.com', $fileContent);
+        $this->assertStringNotContainsString('SWAGGER_LUME_CONST_HOST', $fileContent);
     }
 
     /** @test */

tests/GeneratorTest.php

@@ -19,8 +19,8 @@ public function canGenerateApiJsonFile()
 
         $this->assertResponseOk();
 
-        $this->assertContains('SwaggerLume', $response->response->getContent());
-        $this->assertContains('my-default-host.com', $response->response->getContent());
+        $this->assertStringContainsString('SwaggerLume', $response->response->getContent());
+        $this->assertStringContainsString('my-default-host.com', $response->response->getContent());
     }
 
     /** @test */
@@ -44,8 +44,8 @@ public function canGenerateApiJsonFileWithChangedBasePath()
 
         $this->assertResponseOk();
 
-        $this->assertContains('SwaggerLume', $response->response->getContent());
-        $this->assertContains('new_path', $response->response->getContent());
+        $this->assertStringContainsString('SwaggerLume', $response->response->getContent());
+        $this->assertStringContainsString('new_path', $response->response->getContent());
     }
 
     /** @test */
@@ -77,7 +77,7 @@ public function canSetValidatorUrl()
 
         $this->assertResponseOk();
 
-        $this->assertContains('validator-url.dev', $response->response->getContent());
+        $this->assertStringContainsString('validator-url.dev', $response->response->getContent());
 
         $this->assertTrue(file_exists($this->jsonDocsFile()));
     }

tests/RoutesTest.php

@@ -37,7 +37,7 @@ public function canAccessDocumentationInterface()
 
         $this->assertResponseOk();
 
-        $this->assertContains($this->docs_url, $response->response->getContent());
+        $this->assertStringContainsString($this->docs_url, $response->response->getContent());
     }
 
     /** @test */
@@ -47,7 +47,7 @@ public function itCanServeAssets()
 
         $this->assertResponseOk();
 
-        $this->assertContains('.swagger-ui', $response->response->getContent());
+        $this->assertStringContainsString('.swagger-ui', $response->response->getContent());
     }
 
     /** @test */
@@ -57,7 +57,7 @@ public function userCanAccessOauth2Redirect()
 
         $this->assertResponseOk();
 
-        $this->assertContains('swaggerUIRedirectOauth2', $response->response->getContent());
-        $this->assertContains('oauth2.auth.code', $response->response->getContent());
+        $this->assertStringContainsString('swaggerUIRedirectOauth2', $response->response->getContent());
+        $this->assertStringContainsString('oauth2.auth.code', $response->response->getContent());
     }
 }

tests/SecurityDefinitionsTest.php

@@ -34,7 +34,7 @@ public function canGenerateApiJsonFileWithSecurityDefinition()
 
         $this->assertResponseOk();
 
-        $this->assertContains('new_api_key_securitye', $response->response->getContent());
+        $this->assertStringContainsString('new_api_key_securitye', $response->response->getContent());
         $this->seeJson($security);
     }
 
@@ -69,8 +69,8 @@ public function canGenerateApiJsonFileWithSecurityDefinitionOpenApi3()
 
         $content = $response->response->getContent();
 
-        $this->assertContains('new_api_key_security', $content);
-        $this->assertContains('oauth2', $content);
+        $this->assertStringContainsString('new_api_key_security', $content);
+        $this->assertStringContainsString('oauth2', $content);
         $this->seeJson($security);
     }
 }