xini / silverstripe-section-io

tests/SectionIOTest.php

Spacing +12 added lines, -12 removed lines

@@ -35,8 +35,8 @@ 
         $folderIDs = $this->allFixtureIDs('Folder');
         foreach ($folderIDs as $folderID) {
             $folder = DataObject::get_by_id('Folder', $folderID);
-            if (!file_exists(BASE_PATH."/$folder->Filename")) {
-                mkdir(BASE_PATH."/$folder->Filename");
+            if (!file_exists(BASE_PATH . "/$folder->Filename")) {
+                mkdir(BASE_PATH . "/$folder->Filename");
             }
         }
 
@@ -44,7 +44,7 @@ 
         $imageIDs = $this->allFixtureIDs('Image');
         foreach ($imageIDs as $imageID) {
             $image = DataObject::get_by_id('Image', $imageID);
-            $filePath = BASE_PATH."/$image->Filename";
+            $filePath = BASE_PATH . "/$image->Filename";
             $sourcePath = str_replace('assets/SectionTest/', 'section-io/tests/testfiles/', $filePath);
             if (!file_exists($filePath)) {
                 if (!copy($sourcePath, $filePath)) {
@@ -57,7 +57,7 @@ 
         $fileIDs = $this->allFixtureIDs('File');
         foreach ($fileIDs as $fileID) {
             $file = DataObject::get_by_id('File', $fileID);
-            $filePath = BASE_PATH."/$file->Filename";
+            $filePath = BASE_PATH . "/$file->Filename";
             $sourcePath = str_replace('assets/SectionTest/', 'section-io/tests/testfiles/', $filePath);
             if (!file_exists($filePath)) {
                 if (!copy($sourcePath, $filePath)) {
@@ -82,8 +82,8 @@ 
         $imageIDs = $this->allFixtureIDs('Image');
         foreach ($imageIDs as $imageID) {
             $image = DataObject::get_by_id('Image', $imageID);
-            if ($image && file_exists(BASE_PATH."/$image->Filename")) {
-                unlink(BASE_PATH."/$image->Filename");
+            if ($image && file_exists(BASE_PATH . "/$image->Filename")) {
+                unlink(BASE_PATH . "/$image->Filename");
             }
         }
 
@@ -91,8 +91,8 @@ 
         $fileIDs = $this->allFixtureIDs('File');
         foreach ($fileIDs as $fileID) {
             $file = DataObject::get_by_id('File', $fileID);
-            if ($file && file_exists(BASE_PATH."/$file->Filename")) {
-                unlink(BASE_PATH."/$file->Filename");
+            if ($file && file_exists(BASE_PATH . "/$file->Filename")) {
+                unlink(BASE_PATH . "/$file->Filename");
             }
         }
 
@@ -100,11 +100,11 @@ 
         $folderIDs = $this->allFixtureIDs('Folder');
         foreach ($folderIDs as $folderID) {
             $folder = DataObject::get_by_id('Folder', $folderID);
-            if ($folder && file_exists(BASE_PATH.'/'.$folder->Filename.'_resampled')) {
-                Filesystem::removeFolder(BASE_PATH.'/'.$folder->Filename.'_resampled');
+            if ($folder && file_exists(BASE_PATH . '/' . $folder->Filename . '_resampled')) {
+                Filesystem::removeFolder(BASE_PATH . '/' . $folder->Filename . '_resampled');
             }
-            if ($folder && file_exists(BASE_PATH."/$folder->Filename")) {
-                Filesystem::removeFolder(BASE_PATH."/$folder->Filename");
+            if ($folder && file_exists(BASE_PATH . "/$folder->Filename")) {
+                Filesystem::removeFolder(BASE_PATH . "/$folder->Filename");
             }
         }
 

code/SecionIO.php

Spacing +13 added lines, -13 removed lines

@@ -38,9 +38,9 @@ 
     {
         $image = Image::get()->byID($imageID);
         if ($image && $image->exists()) {
-            $exp = 'obj.http.x-url ~ "^/'.preg_quote($image->getFilename()).'$"'; // image itself
-            $exp    .= ' || obj.http.x-url ~ "^/'.preg_quote($image->Parent()->getFilename())
-                    .'_resampled/(.*)\-'.preg_quote($image->Name).'$"'; // resampled versions
+            $exp = 'obj.http.x-url ~ "^/' . preg_quote($image->getFilename()) . '$"'; // image itself
+            $exp .= ' || obj.http.x-url ~ "^/' . preg_quote($image->Parent()->getFilename())
+                    .'_resampled/(.*)\-' . preg_quote($image->Name) . '$"'; // resampled versions
             return static::performFlush($exp);
         }
 
@@ -51,7 +51,7 @@ 
     {
         $file = File::get()->byID($fileID);
         if ($file && $file->exists()) {
-            $exp = 'obj.http.x-url ~ "^/'.preg_quote($file->getFilename()).'$"';
+            $exp = 'obj.http.x-url ~ "^/' . preg_quote($file->getFilename()) . '$"';
 
             return static::performFlush($exp);
         }
@@ -67,23 +67,23 @@ 
             switch ($strategy) {
 
                 case 'single':
-                    $exp = 'obj.http.content-type ~ "'.preg_quote('text/html').'"';
-                    $exp .= ' && obj.http.x-url ~ "^'.preg_quote($sitetree->Link()).'$"';
+                    $exp = 'obj.http.content-type ~ "' . preg_quote('text/html') . '"';
+                    $exp .= ' && obj.http.x-url ~ "^' . preg_quote($sitetree->Link()) . '$"';
                     break;
 
                 case 'parents':
-                    $exp = 'obj.http.content-type ~ "'.preg_quote('text/html').'"';
-                    $exp .= ' && (obj.http.x-url ~ "^'.preg_quote($sitetree->Link()).'$"';
+                    $exp = 'obj.http.content-type ~ "' . preg_quote('text/html') . '"';
+                    $exp .= ' && (obj.http.x-url ~ "^' . preg_quote($sitetree->Link()) . '$"';
                     $parent = $sitetree->getParent();
                     while ($parent && $parent->exists()) {
-                        $exp .= ' || obj.http.x-url ~ "^'.preg_quote($parent->Link()).'$"';
+                        $exp .= ' || obj.http.x-url ~ "^' . preg_quote($parent->Link()) . '$"';
                         $parent = $parent->getParent();
                     }
                     $exp .= ')';
                     break;
 
                 case 'all':
-                    $exp = 'obj.http.content-type ~ "'.preg_quote('text/html').'"';
+                    $exp = 'obj.http.content-type ~ "' . preg_quote('text/html') . '"';
                     break;
 
                 case 'everyting':
@@ -120,10 +120,10 @@ 
                 $conn = $service->request(null, 'POST', null, $headers, $options);
 
                 if ($conn->isError()) {
-                    user_error('SectionIO::performFlush :: '.$conn->getStatusCode().' : '.$conn->getStatusDescription().' : '.$url, E_USER_WARNING);
+                    user_error('SectionIO::performFlush :: ' . $conn->getStatusCode() . ' : ' . $conn->getStatusDescription() . ' : ' . $url, E_USER_WARNING);
                     $success = $success && false;
                 } else {
-                    user_error('SectionIO::performFlush :: ban successful. url: '.$url."; ban expression: '".$banExpression."'", E_USER_NOTICE);
+                    user_error('SectionIO::performFlush :: ban successful. url: ' . $url . "; ban expression: '" . $banExpression . "'", E_USER_NOTICE);
                 }
             }
         } else {
@@ -169,7 +169,7 @@ 
     {
         $cert = ini_get('curl.cainfo');
         if (!$cert) {
-            $cert = BASE_PATH.'/'.SECTIONIO_BASE.'/cert/cacert.pem';
+            $cert = BASE_PATH . '/' . SECTIONIO_BASE . '/cert/cacert.pem';
         }
 
         return $cert;