Merge pull request #2 from romanlum/feature/allow-exclamation-mark

Change ini parser to RAW mode
moay · Mar 26, 2021 · c53ccea · c53ccea
2 parents 85a8d30 + 92a7465
commit c53ccea
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/ConfigurationParser/ConfigurationParser.php b/src/ConfigurationParser/ConfigurationParser.php
@@ -22,7 +22,7 @@ public function __construct(string $fileName)
         if (!file_exists($fileName)) {
             throw new ConfigurationException(sprintf('Configuration file %s does not exist', $fileName));
         }
-        $this->config = new \Config_Lite($fileName);
+        $this->config = new \Config_Lite($fileName,null,INI_SCANNER_RAW );
     }
 
     /**

diff --git a/tests/ConfigurationParser/ConfigurationParserTest.php b/tests/ConfigurationParser/ConfigurationParserTest.php
@@ -29,8 +29,8 @@ protected function setUp(): void
     public function testConfigurationIsReadFromFile()
     {
         $configuration = new ConfigurationParser(self::TEST_CONFIG_FILE);
-        $this->assertEquals('test', $configuration->get('TEST1', 'test'));
-        $this->assertEquals('test4', $configuration->get('TEST3', 'test4'));
+        $this->assertEquals('\'test\'', $configuration->get('TEST1', 'test'));
+        $this->assertEquals('\'test4\'', $configuration->get('TEST3', 'test4'));
     }
 
     public function testConfigurationThrowsExceptionIfFileDoesNotExist()

diff --git a/tests/ConfigurationParser/SystemConfigurationParserTest.php b/tests/ConfigurationParser/SystemConfigurationParserTest.php
@@ -76,7 +76,7 @@ public function regularValues()
             ['BINARIES', 'REBOOT', '/sbin/reboot'],
             ['BINARIES', 'NTPDATE', '/usr/sbin/ntpdate'],
             ['BINARIES', 'AWK', '/usr/bin/awk'],
-            ['MINISERVER1', 'PASS', 'test12345'],
+            ['MINISERVER1', 'PASS', 'test12345!'],
             ['MINISERVER1', 'IPADDRESS', '192.168.0.0'],
             ['MINISERVER1', 'ADMIN', 'Admin'],
             ['MINISERVER1', 'ENCRYPTRESPONSE', null],
@@ -189,11 +189,11 @@ public function testLoadsMiniserverInformation()
         $this->assertFalse($miniserverByName->isSecureGateway());
         $this->assertFalse($miniserverByName->isUseCloudDns());
         $this->assertSame('Admin', $miniserverByName->getAdminUsername());
-        $this->assertSame('test12345', $miniserverByName->getAdminPassword());
-        $this->assertSame('Admin:test12345', $miniserverByName->getCredentials());
+        $this->assertSame('test12345!', $miniserverByName->getAdminPassword());
+        $this->assertSame('Admin:test12345!', $miniserverByName->getCredentials());
         $this->assertSame('Admin', $miniserverByName->getAdminUsername(true));
-        $this->assertSame('test12345', $miniserverByName->getAdminPassword(true));
-        $this->assertSame('Admin:test12345', $miniserverByName->getCredentials(true));
+        $this->assertSame('test12345!', $miniserverByName->getAdminPassword(true));
+        $this->assertSame('Admin:test12345!', $miniserverByName->getCredentials(true));
         $this->assertSame('', $miniserverByName->getCloudUrl());
         $this->assertEquals(80, $miniserverByName->getPort());
     }

diff --git a/tests/ConfigurationParser/resources/general.cfg b/tests/ConfigurationParser/resources/general.cfg
@@ -55,7 +55,7 @@ NTPDATE=/usr/sbin/ntpdate
 AWK=/usr/bin/awk
 
 [MINISERVER1]
-PASS=test12345
+PASS=test12345!
 IPADDRESS=192.168.0.0
 ADMIN=Admin
 ENCRYPTRESPONSE=