Put glue before array in all join() calls

utlib · Oct 7, 2020 · 2f2c37e · 2f2c37e
1 parent ae41245
commit 2f2c37e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/libraries/IiifItems/IiifUtil.php b/libraries/IiifItems/IiifUtil.php
@@ -57,19 +57,19 @@ protected static function addDublinCoreMetadata(&$jsonData, $record) {
         ));
         if (isset($elements['Dublin Core'])) {
             if (isset($elements['Dublin Core']['Title'])) {
-                $jsonData['label'] = join($elements['Dublin Core']['Title'], ' ');
+                $jsonData['label'] = join(' ', $elements['Dublin Core']['Title']);
                 unset($elements['Dublin Core']['Title']);
             }
             if (isset($elements['Dublin Core']['Description'])) {
-                $jsonData['description'] = join($elements['Dublin Core']['Description'], '<br>');
+                $jsonData['description'] = join('<br>', $elements['Dublin Core']['Description']);
                 unset($elements['Dublin Core']['Description']);
             }
             if (isset($elements['Dublin Core']['Publisher'])) {
-                $jsonData['attribution'] = join($elements['Dublin Core']['Publisher'], '<br>');
+                $jsonData['attribution'] = join('<br>', $elements['Dublin Core']['Publisher']);
                 unset($elements['Dublin Core']['Publisher']);
             }
             if (isset($elements['Dublin Core']['Rights'])) {
-                $jsonData['license'] = join($elements['Dublin Core']['Rights'], '<br>');
+                $jsonData['license'] = join('<br>', $elements['Dublin Core']['Rights']);
                 unset($elements['Dublin Core']['Rights']);
             }
             if (!empty($elements['Dublin Core'])) {
@@ -79,7 +79,7 @@ protected static function addDublinCoreMetadata(&$jsonData, $record) {
                 foreach ($elements['Dublin Core'] as $elementName => $elementContent) {
                     $jsonData['metadata'][] = array(
                         'label' => $elementName,
-                        'value' => join($elementContent, '<br>')
+                        'value' => join('<br>', $elementContent)
                     );
                 }
             }

diff --git a/libraries/IiifItems/Migration/0_0_1_7.php b/libraries/IiifItems/Migration/0_0_1_7.php
@@ -14,7 +14,7 @@ class IiifItems_Migration_0_0_1_7 extends IiifItems_BaseMigration {
     public function up() {
         // Copy over placeholder images
         $storage = Zend_Registry::get('storage');
-        $placeholderDir = join(array(__DIR__, '..', '..', '..', 'placeholders'), DIRECTORY_SEPARATOR);
+        $placeholderDir = join(DIRECTORY_SEPARATOR, array(__DIR__, '..', '..', '..', 'placeholders'));
         foreach (array_diff(scandir($placeholderDir), array('.', '..')) as $fname) {
             try {
                 copy($placeholderDir . DIRECTORY_SEPARATOR . $fname, $storage->getTempDir() . DIRECTORY_SEPARATOR . $fname);
@@ -29,7 +29,7 @@ public function up() {
     public function uninstall() {
         // Uninstall placeholder images
         $storage = Zend_Registry::get('storage');
-        $placeholderDir = join(array(__DIR__, '..', '..', '..', 'placeholders'), DIRECTORY_SEPARATOR);
+        $placeholderDir = join(DIRECTORY_SEPARATOR, array(__DIR__, '..', '..', '..', 'placeholders'));
         foreach (array_diff(scandir($placeholderDir), array('.', '..')) as $fname) {
             try {
                 $storage->delete($storage->getPathByType($fname, 'original'));

diff --git a/libraries/IiifItems/Util/Annotation.php b/libraries/IiifItems/Util/Annotation.php
@@ -298,7 +298,7 @@ public static function findAnnotationsForNonIiif($item) {
             'resource' => array(
                 '@type' => 'dctypes:Text',
                 'format' => 'text/html',
-                'chars' => '<ul><li>' . join($fileLinks, '</li><li>') . '</li></ul>'
+                'chars' => '<ul><li>' . join('</li><li>', $fileLinks) . '</li></ul>'
             ),
         ));
     }