Fixes for CodeStyle vol.2

[bookstack] / tests / Unit / ConfigTest.php

diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php
index 1d4decc2b330036feed751d396e52215770128ef..f45d201363294274588d2e2ad318b8f970714a61 100644 (file)
--- a/tests/Unit/ConfigTest.php
+++ b/tests/Unit/ConfigTest.php
@@ -1,4 +1,6 @@
-<?php namespace Tests\Unit;
+<?php
+
+namespace Tests\Unit;

 
 use Illuminate\Support\Facades\Log;
 use Tests\TestCase;
 
 use Illuminate\Support\Facades\Log;
 use Tests\TestCase;


@@ -7,15 +9,12 @@ use Tests\TestCase;
  * Class ConfigTest
  * Many of the tests here are to check on tweaks made
  * to maintain backwards compatibility.
  * Class ConfigTest
  * Many of the tests here are to check on tweaks made
  * to maintain backwards compatibility.

- *
- * @package Tests

  */
 class ConfigTest extends TestCase
 {
  */
 class ConfigTest extends TestCase
 {

-

     public function test_filesystem_images_falls_back_to_storage_type_var()
     {
     public function test_filesystem_images_falls_back_to_storage_type_var()
     {

-        $this->runWithEnv('STORAGE_TYPE', 'local_secure', function() {
+        $this->runWithEnv('STORAGE_TYPE', 'local_secure', function () {

             $this->checkEnvConfigResult('STORAGE_IMAGE_TYPE', 's3', 'filesystems.images', 's3');
             $this->checkEnvConfigResult('STORAGE_IMAGE_TYPE', null, 'filesystems.images', 'local_secure');
         });
             $this->checkEnvConfigResult('STORAGE_IMAGE_TYPE', 's3', 'filesystems.images', 's3');
             $this->checkEnvConfigResult('STORAGE_IMAGE_TYPE', null, 'filesystems.images', 'local_secure');
         });


@@ -23,7 +22,7 @@ class ConfigTest extends TestCase
 
     public function test_filesystem_attachments_falls_back_to_storage_type_var()
     {
 
     public function test_filesystem_attachments_falls_back_to_storage_type_var()
     {

-        $this->runWithEnv('STORAGE_TYPE', 'local_secure', function() {
+        $this->runWithEnv('STORAGE_TYPE', 'local_secure', function () {

             $this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', 's3', 'filesystems.attachments', 's3');
             $this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', null, 'filesystems.attachments', 'local_secure');
         });
             $this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', 's3', 'filesystems.attachments', 's3');
             $this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', null, 'filesystems.attachments', 'local_secure');
         });


@@ -46,11 +45,11 @@ class ConfigTest extends TestCase
         ]);
 
         $temp = tempnam(sys_get_temp_dir(), 'bs-test');
         ]);
 
         $temp = tempnam(sys_get_temp_dir(), 'bs-test');

-        $original = ini_set( 'error_log', $temp);
+        $original = ini_set('error_log', $temp);

 
         Log::channel('errorlog_plain_webserver')->info('Aww, look, a cute puppy');
 
 
         Log::channel('errorlog_plain_webserver')->info('Aww, look, a cute puppy');
 

-        ini_set( 'error_log', $original);
+        ini_set('error_log', $original);

 
         $output = file_get_contents($temp);
         $this->assertStringContainsString('Aww, look, a cute puppy', $output);
 
         $output = file_get_contents($temp);
         $this->assertStringContainsString('Aww, look, a cute puppy', $output);


@@ -67,16 +66,27 @@ class ConfigTest extends TestCase
         $this->checkEnvConfigResult('APP_URL', '', 'session.path', '/');
     }
 
         $this->checkEnvConfigResult('APP_URL', '', 'session.path', '/');
     }
 

+    public function test_saml2_idp_authn_context_string_parsed_as_space_separated_array()
+    {
+        $this->checkEnvConfigResult(
+            'SAML2_IDP_AUTHNCONTEXT',
+            'urn:federation:authentication:windows urn:federation:authentication:linux',
+            'saml2.onelogin.security.requestedAuthnContext',
+            ['urn:federation:authentication:windows', 'urn:federation:authentication:linux']
+        );
+    }
+

     /**
      * Set an environment variable of the given name and value
      * then check the given config key to see if it matches the given result.
      * Providing a null $envVal clears the variable.
     /**
      * Set an environment variable of the given name and value
      * then check the given config key to see if it matches the given result.
      * Providing a null $envVal clears the variable.

+     *
+     * @param mixed $expectedResult

      */
      */

-    protected function checkEnvConfigResult(string $envName, ?string $envVal, string $configKey, string $expectedResult)
+    protected function checkEnvConfigResult(string $envName, ?string $envVal, string $configKey, $expectedResult)

     {
     {

-        $this->runWithEnv($envName, $envVal, function() use ($configKey, $expectedResult) {
+        $this->runWithEnv($envName, $envVal, function () use ($configKey, $expectedResult) {

             $this->assertEquals($expectedResult, config($configKey));
         });
     }
             $this->assertEquals($expectedResult, config($configKey));
         });
     }

-
-}
\ No newline at end of file
+}