seboettg / citeproc-php

src/StyleSheet.php

Spacing +7 added lines, -7 removed lines

@@ -34,8 +34,8 @@ 
      */
     public static function loadStyleSheet($styleName)
     {
-        $stylesPath = self::vendorPath() . "/citation-style-language/styles-distribution/";
-        return file_get_contents($stylesPath . $styleName . '.csl');
+        $stylesPath = self::vendorPath()."/citation-style-language/styles-distribution/";
+        return file_get_contents($stylesPath.$styleName.'.csl');
     }
 
     /**
@@ -48,14 +48,14 @@ 
     public static function loadLocales($langKey)
     {
         $data = null;
-        $localesPath = self::vendorPath() . "/citation-style-language/locales/";
-        $localeFile = $localesPath . "locales-" . $langKey . '.xml';
+        $localesPath = self::vendorPath()."/citation-style-language/locales/";
+        $localeFile = $localesPath."locales-".$langKey.'.xml';
         if (file_exists($localeFile)) {
             $data = file_get_contents($localeFile);
         } else {
             $metadata = self::loadLocalesMetadata();
             if (!empty($metadata->{'primary-dialects'}->{$langKey})) {
-                $data = file_get_contents($localesPath . "locales-" . $metadata->{'primary-dialects'}->{$langKey} . '.xml');
+                $data = file_get_contents($localesPath."locales-".$metadata->{'primary-dialects'}->{$langKey}.'.xml');
             }
         }
 
@@ -68,7 +68,7 @@ 
      */
     public static function loadLocalesMetadata()
     {
-        $localesMetadataPath = self::vendorPath() . "/citation-style-language/locales/locales.json";
+        $localesMetadataPath = self::vendorPath()."/citation-style-language/locales/locales.json";
         return json_decode(file_get_contents($localesMetadataPath));
     }
 
@@ -78,7 +78,7 @@ 
      */
     private static function vendorPath()
     {
-        include_once realpath(__DIR__ . '/../') . '/vendorPath.php';
+        include_once realpath(__DIR__.'/../').'/vendorPath.php';
         if (!($vendorPath = vendorPath())) {
             // @codeCoverageIgnoreStart
             throw new CiteProcException('vendor path not found. Use composer to initialize your project');

src/Locale/Term.php

Spacing +3 added lines, -3 removed lines

@@ -41,13 +41,13 @@
         $attr = "";
         for ($i = count($nameParts) - 1; $i >= 0; --$i) {
             if ($i > 0) {
-                $attr = ucfirst($nameParts[$i]) . $attr;
+                $attr = ucfirst($nameParts[$i]).$attr;
             } else {
-                $attr = $nameParts[$i] . $attr;
+                $attr = $nameParts[$i].$attr;
             }
         }
         if (!isset($this->{$attr})) {
-            throw new InvalidArgumentException("Property \"$attr\" ($name) does not exist in " . __CLASS__);
+            throw new InvalidArgumentException("Property \"$attr\" ($name) does not exist in ".__CLASS__);
         }
         $this->{$attr} = $value;
     }

src/Rendering/Text.php

Spacing +3 added lines, -3 removed lines

@@ -185,8 +185,8 @@ 
         // test case group_ShortOutputOnly.json
         $renderedText = "";
         if (in_array($this->form, ["short", "long"])) {
-            $attrWithPrefix = $this->form . ucfirst($this->toRenderTypeValue);
-            $attrWithSuffix = $this->toRenderTypeValue . "-" . $this->form;
+            $attrWithPrefix = $this->form.ucfirst($this->toRenderTypeValue);
+            $attrWithSuffix = $this->toRenderTypeValue."-".$this->form;
             if (isset($data->{$attrWithPrefix}) && !empty($data->{$attrWithPrefix})) {
                 $renderedText = $this->applyTextCase(StringHelper::clearApostrophes($data->{$attrWithPrefix}), $lang);
             } else {
@@ -246,7 +246,7 @@ 
         $macro = CiteProc::getContext()->getMacro($this->toRenderTypeValue);
         if (is_null($macro)) {
             try {
-                throw new CiteProcException("Macro \"" . $this->toRenderTypeValue . "\" does not exist.");
+                throw new CiteProcException("Macro \"".$this->toRenderTypeValue."\" does not exist.");
             } catch (CiteProcException $e) {
                 $renderedText = "";
             }

src/Rendering/Number.php

Spacing +5 added lines, -5 removed lines

@@ -151,7 +151,7 @@ 
         if (empty($ordinalSuffix)) {
             $ordinalSuffix = CiteProc::getContext()->getLocale()->filter('terms', 'ordinal')->single;
         }
-        return $num . $ordinalSuffix;
+        return $num.$ordinalSuffix;
     }
 
     /**
@@ -160,7 +160,7 @@ 
      */
     public static function longOrdinal($num) {
         $num = sprintf("%02d", $num);
-        $ret = CiteProc::getContext()->getLocale()->filter('terms', 'long-ordinal-' . $num)->single;
+        $ret = CiteProc::getContext()->getLocale()->filter('terms', 'long-ordinal-'.$num)->single;
         if (!$ret) {
             return self::ordinal($num);
         }
@@ -176,11 +176,11 @@ 
     public function buildNumberRangeString($num1, $num2, $delim) {
 
         if (self::RANGE_DELIMITER_AMPERSAND === $delim) {
-            $numRange = "$num1 " . htmlentities(self::RANGE_DELIMITER_AMPERSAND) . " $num2";
+            $numRange = "$num1 ".htmlentities(self::RANGE_DELIMITER_AMPERSAND)." $num2";
         } else if (self::RANGE_DELIMITER_COMMA === $delim) {
-            $numRange = $num1 . htmlentities(self::RANGE_DELIMITER_COMMA) . " $num2";
+            $numRange = $num1.htmlentities(self::RANGE_DELIMITER_COMMA)." $num2";
         } else {
-            $numRange = $num1 . self::RANGE_DELIMITER_HYPHEN . $num2;
+            $numRange = $num1.self::RANGE_DELIMITER_HYPHEN.$num2;
         }
         return $numRange;
     }

src/Rendering/Date/DateTime.php

Spacing +2 added lines, -2 removed lines

@@ -126,8 +126,8 @@
     public function renderNumeric()
     {
         $ret  = $this->year;
-        $ret .= $this->month > 0 && $this->month < 13 ? "-" . sprintf("%02s", $this->month) : "";
-        $ret .= $this->day > 0 && $this->day < 32 ? "-" . sprintf("%02s", $this->day) : "";
+        $ret .= $this->month > 0 && $this->month < 13 ? "-".sprintf("%02s", $this->month) : "";
+        $ret .= $this->day > 0 && $this->day < 32 ? "-".sprintf("%02s", $this->day) : "";
         return $ret;
     }
 }
\ No newline at end of file

src/Rendering/Date/Date.php

Spacing +8 added lines, -8 removed lines

@@ -97,7 +97,7 @@ 
         foreach ($node->children() as $child) {
             if ($child->getName() === "date-part") {
                 $datePartName = (string) $child->attributes()["name"];
-                $this->dateParts->set($this->form . "-" . $datePartName, Util\Factory::create($child));
+                $this->dateParts->set($this->form."-".$datePartName, Util\Factory::create($child));
             }
         }
 
@@ -167,15 +167,15 @@ 
                 $toRender = 0;
                 if ($interval->y > 0 && in_array('year', $dateParts)) {
                     $toRender |= self::DATE_RANGE_STATE_YEAR;
-                    $delim = $this->dateParts->get($this->form . "-year")->getRangeDelimiter();
+                    $delim = $this->dateParts->get($this->form."-year")->getRangeDelimiter();
                 }
                 if ($interval->m > 0 && $from->getMonth() - $to->getMonth() !== 0 && in_array('month', $dateParts)) {
                     $toRender |= self::DATE_RANGE_STATE_MONTH;
-                    $delim = $this->dateParts->get($this->form . "-month")->getRangeDelimiter();
+                    $delim = $this->dateParts->get($this->form."-month")->getRangeDelimiter();
                 }
                 if ($interval->d > 0 && $from->getDay() - $to->getDay() !== 0 && in_array('day', $dateParts)) {
                     $toRender |= self::DATE_RANGE_STATE_DAY;
-                    $delim = $this->dateParts->get($this->form . "-day")->getRangeDelimiter();
+                    $delim = $this->dateParts->get($this->form."-day")->getRangeDelimiter();
                 }
                 if ($toRender === self::DATE_RANGE_STATE_NONE) {
                     $ret .= $this->iterateAndRenderDateParts($dateParts, $data_);
@@ -185,7 +185,7 @@ 
             }
 
             if (isset($var->raw) && preg_match("/(\p{L}+)\s?([\-\-&,])\s?(\p{L}+)/u", $var->raw, $matches)) {
-                return $matches[1] . $matches[2] . $matches[3];
+                return $matches[1].$matches[2].$matches[3];
             }
         }
         // fallback:
@@ -366,7 +366,7 @@ 
                         $renderedTo  = $datePart[0]->renderWithoutAffixes($to, $this);
                         $renderedTo .= $datePart[0]->renderSuffix();
                         $renderedTo .= $datePart[1]->render($to, $this);
-                        $ret .= $renderedFrom . $delim . $renderedTo;
+                        $ret .= $renderedFrom.$delim.$renderedTo;
                     } else {
                         $ret .= $datePart->render($from, $this);
                     }
@@ -389,7 +389,7 @@ 
         $from = $datePart->renderWithoutAffixes($from, $this);
         $to = $datePart->renderWithoutAffixes($to, $this);
         $suffix = !empty($to) ? $datePart->renderSuffix() : "";
-        return $prefix . $from . $delim . $to . $suffix;
+        return $prefix.$from.$delim.$to.$suffix;
     }
 
     /**
@@ -494,7 +494,7 @@ 
                 }
             } else { //otherwise create default date parts
                 foreach ($dateParts as $datePart) {
-                    $this->dateParts->add("$form-$datePart", new DatePart(new SimpleXMLElement('<date-part name="' . $datePart . '" form="' . $form . '" />')));
+                    $this->dateParts->add("$form-$datePart", new DatePart(new SimpleXMLElement('<date-part name="'.$datePart.'" form="'.$form.'" />')));
                 }
             }
         }

src/Rendering/Date/DatePart.php

Spacing +3 added lines, -3 removed lines

@@ -146,11 +146,11 @@ 
     {
         $text = $date->getYear();
         if ($text > 0 && $text < 1000) {
-            $text = $text . CiteProc::getContext()->getLocale()->filter("terms", "ad")->single;
+            $text = $text.CiteProc::getContext()->getLocale()->filter("terms", "ad")->single;
             return $text;
         } elseif ($text < 0) {
             $text = $text * -1;
-            $text = $text . CiteProc::getContext()->getLocale()->filter("terms", "bc")->single;
+            $text = $text.CiteProc::getContext()->getLocale()->filter("terms", "bc")->single;
             return $text;
         }
         return $text;
@@ -223,7 +223,7 @@ 
         if (empty($form)) {
             $form = "long";
         }
-        $month = 'month-' . sprintf('%02d', $text);
+        $month = 'month-'.sprintf('%02d', $text);
         $text = CiteProc::getContext()->getLocale()->filter('terms', $month, $form)->single;
         return $text;
     }

src/Rendering/Layout.php

Spacing +8 added lines, -9 removed lines

@@ -86,13 +86,12 @@ 
         }
 
         if (CiteProc::getContext()->isModeBibliography()) {
-            foreach ($data as $citationNumber => $item) {
-                ++self::$numberOfCitedItems;
+            foreach ($data as $citationNumber => $item) {++self::$numberOfCitedItems;
                 CiteProc::getContext()->getResults()->append($this->wrapBibEntry($item, $this->renderSingle($item, $citationNumber)));
             }
             $ret .= implode($this->delimiter, CiteProc::getContext()->getResults()->toArray());
             $ret = StringHelper::clearApostrophes($ret);
-            return "<div class=\"csl-bib-body\">" . $ret . "\n</div>";
+            return "<div class=\"csl-bib-body\">".$ret."\n</div>";
 
         } else if (CiteProc::getContext()->isModeCitation()) {
             if ($citationItems->count() > 0) { //is there a filter for specific citations?
@@ -140,9 +139,9 @@ 
 
         if (!empty($inMargin) && !empty($margin) && CiteProc::getContext()->isModeBibliography()) {
             $leftMargin = $this->removeConsecutiveChars($this->htmlentities($this->format(implode("", $inMargin))));
-            $rightInline = $this->removeConsecutiveChars($this->htmlentities($this->format(implode("", $margin))) . $this->suffix);
-            $res  = '<div class="csl-left-margin">' . $leftMargin . '</div>';
-            $res .= '<div class="csl-right-inline">' . $rightInline . '</div>';
+            $rightInline = $this->removeConsecutiveChars($this->htmlentities($this->format(implode("", $margin))).$this->suffix);
+            $res  = '<div class="csl-left-margin">'.$leftMargin.'</div>';
+            $res .= '<div class="csl-right-inline">'.$rightInline.'</div>';
             return $res;
         } else if (!empty($inMargin)) {
             $res = $this->format(implode("", $inMargin));
@@ -166,9 +165,9 @@ 
     private function wrapBibEntry($dataItem, $value)
     {
         $value = $this->addAffixes($value);
-        return "\n  " .
-            "<div class=\"csl-entry\">" .
-            $renderedItem = CiteProcHelper::applyAdditionMarkupFunction($dataItem, "csl-entry", $value) .
+        return "\n  ".
+            "<div class=\"csl-entry\">".
+            $renderedItem = CiteProcHelper::applyAdditionMarkupFunction($dataItem, "csl-entry", $value).
             "</div>";
     }
 

src/Rendering/Name/Name.php

Spacing +18 added lines, -18 removed lines

@@ -98,7 +98,7 @@ 
         foreach ($node->attributes() as $attribute) {
             switch ($attribute->getName()) {
                 case 'form':
-                    $this->form = (string)$attribute;
+                    $this->form = (string) $attribute;
                     break;
             }
 
@@ -160,7 +160,7 @@ 
         cs:names element (taking into account the effects of et-al abbreviation and editor/translator collapsing),
         which allows for advanced sorting. */
         if ($this->form == 'count') {
-            return (int)count($resultNames);
+            return (int) count($resultNames);
         }
 
         return $text;
@@ -262,17 +262,17 @@ 
 
             switch ($this->delimiterPrecedesEtAl) {
                 case 'never':
-                    $text = $text . " " . $this->etAl;
+                    $text = $text." ".$this->etAl;
                     break;
                 case 'always':
-                    $text = $text . $this->delimiter . $this->etAl;
+                    $text = $text.$this->delimiter.$this->etAl;
                     break;
                 case 'contextual':
                 default:
                     if (count($resultNames) === 1) {
-                        $text .= " " . $this->etAl;
+                        $text .= " ".$this->etAl;
                     } else {
-                        $text .= $this->delimiter . $this->etAl;
+                        $text .= $this->delimiter.$this->etAl;
                     }
             }
         }
@@ -454,7 +454,7 @@ 
                 $text = implode(" ", $resultNames);
             } else { // >2
                 $lastName = array_pop($resultNames);
-                $text = implode($this->delimiter, $resultNames) . " " . $lastName;
+                $text = implode($this->delimiter, $resultNames)." ".$lastName;
             }
         }
         return $text;
@@ -483,7 +483,7 @@ 
     {
         $count = count($resultNames);
         if (!empty($this->and) && $count > 1 && empty($this->etAl)) {
-            $new = $this->and . ' ' . end($resultNames); // add and-prefix of the last name if "and" is defined
+            $new = $this->and.' '.end($resultNames); // add and-prefix of the last name if "and" is defined
             $resultNames[count($resultNames) - 1] = $new; //set prefixed last name at the last position of $resultNames array
         }
     }
@@ -528,8 +528,8 @@ 
 
         if (StringHelper::isLatinString(NameHelper::normalizeName($data)) || StringHelper::isCyrillicString(NameHelper::normalizeName($data))) {
             if ($this->form === "long" && $nameAsSortOrder &&
-                ((string)$demoteNonDroppingParticle === DemoteNonDroppingParticle::NEVER ||
-                    (string)$demoteNonDroppingParticle === DemoteNonDroppingParticle::SORT_ONLY)
+                ((string) $demoteNonDroppingParticle === DemoteNonDroppingParticle::NEVER ||
+                    (string) $demoteNonDroppingParticle === DemoteNonDroppingParticle::SORT_ONLY)
             ) {
 
                 // [La] [Fontaine], [Jean] [de], [III]
@@ -538,11 +538,11 @@ 
 
                 list($family, $given) = $this->renderNameParts($data);
 
-                $text = $family . (!empty($given) ? $this->sortSeparator . $given : "");
-                $text .= !empty($data->suffix) ? $this->sortSeparator . $data->suffix : "";
+                $text = $family.(!empty($given) ? $this->sortSeparator.$given : "");
+                $text .= !empty($data->suffix) ? $this->sortSeparator.$data->suffix : "";
             } else if ($this->form === "long" && $nameAsSortOrder &&
                 (is_null($demoteNonDroppingParticle) ||
-                    (string)$demoteNonDroppingParticle === DemoteNonDroppingParticle::DISPLAY_AND_SORT)
+                    (string) $demoteNonDroppingParticle === DemoteNonDroppingParticle::DISPLAY_AND_SORT)
             ) {
                 // [Fontaine], [Jean] [de] [La], [III]
 
@@ -550,14 +550,14 @@ 
                 NameHelper::appendParticleTo($data, "given", "non-dropping-particle");
                 list($family, $given) = $this->renderNameParts($data);
                 $text = $family;
-                $text .= !empty($given) ? $this->sortSeparator . $given : "";
-                $text .= !empty($data->suffix) ? $this->sortSeparator . $data->suffix : "";
+                $text .= !empty($given) ? $this->sortSeparator.$given : "";
+                $text .= !empty($data->suffix) ? $this->sortSeparator.$data->suffix : "";
 
             } else if ($this->form === "long" && $nameAsSortOrder && empty($demoteNonDroppingParticle)) {
                 list($family, $given) = $this->renderNameParts($data);
                 $text = $family;
-                $text .= !empty($given) ? $this->delimiter . $given : "";
-                $text .= !empty($data->suffix) ? $this->sortSeparator . $data->suffix : "";
+                $text .= !empty($given) ? $this->delimiter.$given : "";
+                $text .= !empty($data->suffix) ? $this->sortSeparator.$data->suffix : "";
             } else if ($this->form === "short") {
                 // [La] [Fontaine]
                 NameHelper::prependParticleTo($data, "family", "non-dropping-particle");
@@ -569,7 +569,7 @@ 
                 NameHelper::prependParticleTo($data, "family", "dropping-particle");
                 NameHelper::appendParticleTo($data, "family", "suffix");
                 list($family, $given) = $this->renderNameParts($data);
-                $text = !empty($given) ? $given . " " . $family : $family;
+                $text = !empty($given) ? $given." ".$family : $family;
             }
         } else {
             $text = $this->form === "long" ? $data->family.$data->given : $data->family;