Merge pull request #50 from creative-commoners/pulls/2/php81

ENH PHP 8.1 compatibility
silverstripe · Apr 26, 2022 · 6bdf037 · 6bdf037
2 parents 95659b0 + d2b6e0b
commit 6bdf037
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/src/Handling/SpellCheckAdminExtension.php b/src/Handling/SpellCheckAdminExtension.php
@@ -60,7 +60,7 @@ public function getLanguages()
         foreach (SpellController::get_locales() as $locale) {
             $localeName = i18n::getData()->localeName($locale);
             // Fix incorrectly spelled Māori language
-            $localeName = str_replace('Maori', 'Māori', $localeName);
+            $localeName = str_replace('Maori', 'Māori', $localeName ?? '');
             $languages[] = $localeName . '=' . $locale;
         }
         return $languages;

diff --git a/src/Handling/SpellCheckMiddleware.php b/src/Handling/SpellCheckMiddleware.php
@@ -39,7 +39,7 @@ public function getLanguages()
         foreach (SpellController::get_locales() as $locale) {
             $localeName = i18n::getData()->localeName($locale);
             // Fix incorrectly spelled Māori language
-            $localeName = str_replace('Maori', 'Māori', $localeName);
+            $localeName = str_replace('Maori', 'Māori', $localeName ?? '');
             $languages[] = $localeName . '=' . $locale;
         }
         return $languages;

diff --git a/src/Handling/SpellController.php b/src/Handling/SpellController.php
@@ -197,7 +197,7 @@ public function index()
         // Perform action
         try {
             $method = $data['method'];
-            $words = explode(' ', $data['text']);
+            $words = explode(' ', $data['text'] ?? '');
             switch ($method) {
                 case 'spellcheck':
                     return $this->success($this->assembleData($locale, $words));
@@ -279,11 +279,11 @@ protected function getLocale(array $data)
         $locale = $data['lang'];
 
         // Check if the locale is actually a language
-        if (strpos($locale, '_') === false) {
+        if (strpos($locale ?? '', '_') === false) {
             $locale = i18n::getData()->localeFromLang($locale);
         }
 
-        if (!in_array($locale, self::get_locales())) {
+        if (!in_array($locale, self::get_locales() ?? [])) {
             return false;
         }
 

diff --git a/src/Providers/HunSpellProvider.php b/src/Providers/HunSpellProvider.php
@@ -31,7 +31,7 @@ class HunSpellProvider implements SpellProvider
     protected function invoke($locale, $input, &$stdout, &$stderr)
     {
         // Prepare arguments
-        $command = 'hunspell -d ' . escapeshellarg($locale);
+        $command = 'hunspell -d ' . escapeshellarg($locale ?? '');
         $descriptorSpecs = array(
             0 => array("pipe", "r"),
             1 => array("pipe", "w"),
@@ -41,13 +41,13 @@ protected function invoke($locale, $input, &$stdout, &$stderr)
             'LANG' => $locale . '.utf-8'
         );
         // Invoke command
-        $proc = proc_open($command, $descriptorSpecs, $pipes, null, $env);
+        $proc = proc_open($command ?? '', $descriptorSpecs ?? [], $pipes, null, $env);
         if (!is_resource($proc)) {
             return 255;
         }
 
         // Send content as input
-        fwrite($pipes[0], $input);
+        fwrite($pipes[0], $input ?? '');
         fclose($pipes[0]);
 
         // Get output
@@ -82,9 +82,9 @@ protected function getResults($locale, $words)
         // Parse results
         $pattern = Config::inst()->get(__CLASS__, 'pattern');
         $results = array();
-        foreach (preg_split('/$\R?^/m', $stdout) as $line) {
-            if (preg_match($pattern, $line, $matches)) {
-                $results[$matches['original']] = explode(', ', $matches['misses']);
+        foreach (preg_split('/$\R?^/m', $stdout ?? '') as $line) {
+            if (preg_match($pattern ?? '', $line ?? '', $matches)) {
+                $results[$matches['original']] = explode(', ', $matches['misses'] ?? '');
             }
         }
         return $results;
@@ -93,7 +93,7 @@ protected function getResults($locale, $words)
     public function checkWords($locale, $words)
     {
         $results = $this->getResults($locale, $words);
-        return array_keys($results);
+        return array_keys($results ?? []);
     }
 
     public function getSuggestions($locale, $word)

diff --git a/tests/HunSpellProviderTest.php b/tests/HunSpellProviderTest.php
@@ -19,7 +19,7 @@ class HunSpellProviderTest extends SapphireTest
      */
     protected function assertArrayContains($needles, $haystack)
     {
-        $overlap = array_intersect($needles, $haystack);
+        $overlap = array_intersect($needles ?? [], $haystack);
         $this->assertEquals($overlap, $needles, "Assert that array contains all values specified");
     }
 

diff --git a/tests/SpellControllerTest.php b/tests/SpellControllerTest.php
@@ -73,21 +73,21 @@ public function testSecurityID()
         // Test request sans token
         $response = $this->get('spellcheck', Injector::inst()->create(Session::class, $session));
         $this->assertEquals(400, $response->getStatusCode());
-        $jsonBody = json_decode($response->getBody());
+        $jsonBody = json_decode($response->getBody() ?? '');
         $this->assertEquals($tokenError, $jsonBody->error);
 
         // Test request with correct token (will fail with an unrelated error)
         $response = $this->get(
-            'spellcheck/?SecurityID='.urlencode($token),
+            'spellcheck/?SecurityID='.urlencode($token ?? ''),
             Injector::inst()->create(Session::class, $session)
         );
-        $jsonBody = json_decode($response->getBody());
+        $jsonBody = json_decode($response->getBody() ?? '');
         $this->assertNotEquals($tokenError, $jsonBody->error);
 
         // Test request with check disabled
         Config::modify()->set(SpellController::class, 'enable_security_token', false);
         $response = $this->get('spellcheck', Injector::inst()->create(Session::class, $session));
-        $jsonBody = json_decode($response->getBody());
+        $jsonBody = json_decode($response->getBody() ?? '');
         $this->assertNotEquals($tokenError, $jsonBody->error);
     }
 
@@ -104,20 +104,20 @@ public function testPermissions()
         Config::modify()->set(SpellController::class, 'required_permission', 'ADMIN');
         $this->logInWithPermission('ADMIN');
         $response = $this->get('spellcheck');
-        $jsonBody = json_decode($response->getBody());
+        $jsonBody = json_decode($response->getBody() ?? '');
         $this->assertNotEquals($securityError, $jsonBody->error);
 
         // Test insufficient permissions
         $this->logInWithPermission('CMS_ACCESS_CMSMain');
         $response = $this->get('spellcheck');
         $this->assertEquals(403, $response->getStatusCode());
-        $jsonBody = json_decode($response->getBody());
+        $jsonBody = json_decode($response->getBody() ?? '');
         $this->assertEquals($securityError, $jsonBody->error);
 
         // Test disabled permissions
         Config::modify()->set(SpellController::class, 'required_permission', false);
         $response = $this->get('spellcheck');
-        $jsonBody = json_decode($response->getBody());
+        $jsonBody = json_decode($response->getBody() ?? '');
         $this->assertNotEquals($securityError, $jsonBody->error);
     }
 
@@ -195,23 +195,23 @@ public function testInputRejection()
         ];
         $response = $this->post('spellcheck', ['ajax' => true] + $mockData);
         $this->assertEquals(200, $response->getStatusCode());
-        $jsonBody = json_decode($response->getBody());
+        $jsonBody = json_decode($response->getBody() ?? '');
         $this->assertNotEmpty($jsonBody->words);
         $this->assertNotEmpty($jsonBody->words->collor);
         $this->assertEquals(['collar', 'colour'], $jsonBody->words->collor);
 
         // Test non-ajax rejection
         $response = $this->post('spellcheck', $mockData);
         $this->assertEquals(400, $response->getStatusCode());
-        $jsonBody = json_decode($response->getBody());
+        $jsonBody = json_decode($response->getBody() ?? '');
         $this->assertEquals($invalidRequest, $jsonBody->error);
 
         // Test incorrect method
         $dataInvalidMethod = $mockData;
         $dataInvalidMethod['method'] = 'validate';
         $response = $this->post('spellcheck', ['ajax' => true] + $dataInvalidMethod);
         $this->assertEquals(400, $response->getStatusCode());
-        $jsonBody = json_decode($response->getBody());
+        $jsonBody = json_decode($response->getBody() ?? '');
         $this->assertEquals(
             _t(
                 'SilverStripe\\SpellCheck\\Handling\\SpellController.UnsupportedMethod',
@@ -226,7 +226,7 @@ public function testInputRejection()
         unset($dataNoMethod['method']);
         $response = $this->post('spellcheck', ['ajax' => true] + $dataNoMethod);
         $this->assertEquals(400, $response->getStatusCode());
-        $jsonBody = json_decode($response->getBody());
+        $jsonBody = json_decode($response->getBody() ?? '');
         $this->assertEquals($invalidRequest, $jsonBody->error);
 
         // Test unsupported locale
@@ -235,7 +235,7 @@ public function testInputRejection()
 
         $response = $this->post('spellcheck', ['ajax' => true] + $dataWrongLocale);
         $this->assertEquals(400, $response->getStatusCode());
-        $jsonBody = json_decode($response->getBody());
+        $jsonBody = json_decode($response->getBody() ?? '');
         $this->assertEquals(_t(
             'SilverStripe\\SpellCheck\\Handling\\SpellController.InvalidLocale',
             'Not a supported locale'