PSR-2 fixes

Author: danmichaelo

src/Collection.php

@@ -14,24 +14,28 @@ class Collection
     public static function fromFile($filename)
     {
         $importer = new Importer($filename, true);
+
         return $importer->getCollection();
     }
 
     public static function fromString($data)
     {
         $importer = new Importer($data, false);
+
         return $importer->getCollection();
     }
 
     public static function fromOaiPmhResponse($data)
     {
         $importer = new OaiPmhResponse($data);
+
         return $importer->getCollection();
     }
 
     public static function fromSruResponse($data)
     {
         $importer = new SruResponse($data);
+
         return $importer->getCollection();
     }
 
@@ -49,7 +53,7 @@ public function parse($source, $isXml, $ns = '', $isPrefix = true)
         }
     }
 
-    public function __get($key='')
+    public function __get($key = '')
     {
         if ($key == 'records') {
             // re-instantiaces..
@@ -59,6 +63,7 @@ public function __get($key='')
             if (is_null($this->_records)) {
                 $this->_records = new Records($this->parser);
             }
+
             return $this->_records;
         }
     }

src/Factory.php

@@ -8,20 +8,23 @@ protected function _make($className, $args)
     {
         $reflectionClass = new \ReflectionClass($className);
         $instance = $reflectionClass->newInstanceArgs($args);
+
         return $instance;
     }
 
     public function make()
     {
         $args = func_get_args();
         $className = array_shift($args);
+
         return $this->_make($className, $args);
     }
 
     public function makeField()
     {
         $args = func_get_args();
         $className = 'Scriptotek\\Marc\\Fields\\' . array_shift($args);
+
         return $this->_make($className, $args);
     }
 }

src/Fields/Isbn.php

@@ -8,7 +8,7 @@ public function __toString()
     {
         $a = $this->field->getSubfield('a');
         if (!$a) {
-            return null;
+            return;
         }
 
         // TODO: Other subfields?

src/Fields/Subject.php

@@ -27,7 +27,8 @@ public function getVocabulary()
         if ($sf2) {
             return $sf2->getData();
         }
-        return null;
+
+        return;
     }
 
     public function __toString()
@@ -38,6 +39,7 @@ public function __toString()
                 $parts[] = $c->getData();
             }
         }
-        return implode(Subject::$glue, $parts);
+
+        return implode(self::$glue, $parts);
     }
 }

src/Fields/Title.php

@@ -4,7 +4,6 @@
 
 class Title extends Field implements FieldInterface
 {
-
     /**
      * See tests/TitleFieldTest.php for more info.
      */
@@ -13,14 +12,14 @@ public function __toString()
         // $a is not repeated
         $a = $this->field->getSubfield('a');
         if (!$a) {
-            return null;
+            return;
         }
         $title = trim($a->getData());
 
         // $b is not repeated
         $b = $this->field->getSubfield('b');
         if ($b) {
-            if (!in_array(substr($title, strlen($title) -1), array(':', ';', '=', '.'))) {
+            if (!in_array(substr($title, strlen($title) - 1), array(':', ';', '=', '.'))) {
                 // Add colon if no ISBD marker present ("British style")
                 $title .= ' :';
             }

src/Importers/Importer.php

@@ -21,10 +21,12 @@ public function getCollection()
         $isXml = (substr($this->data, 0, 1) == '<');
         if ($isXml) {
             $importer = new XmlImporter($this->data);
+
             return $importer->getCollection();
         } else {
             $c = new Collection();
             $c->parse($this->data, false);
+
             return $c;
         }
     }

src/Importers/XmlImporter.php

@@ -29,6 +29,7 @@ public function getMarcNamespace($namespaces)
                 return array($prefix, $ns);
             }
         }
+
         return array('', '');
     }
 
@@ -54,6 +55,7 @@ public function getRecords()
         if (count($marcRecords)) {
             return $marcRecords;
         }
+
         return array();
     }
 
@@ -64,7 +66,6 @@ public function getCollection()
             throw new \ErrorException("Uh oh, didn't find any records");
         }
 
-
         list($prefix, $ns) = $this->getMarcNamespace($records[0]->getNamespaces(true));
         $pprefix = empty($prefix) ? '' : "$prefix:";
 
@@ -93,6 +94,7 @@ public function getCollection()
             '</' . $pprefix . 'collection>';
 
         $this->collection->parse($marcCollection, true, $prefix);
+
         return $this->collection;
     }
 }

src/Record.php

@@ -16,12 +16,14 @@ public function __construct(\File_MARC_Record $record, Factory $factory = null)
     public static function fromFile($filename)
     {
         $collection = Collection::fromFile($filename);
+
         return $collection->records->toArray()[0];
     }
 
     public static function fromString($data)
     {
         $collection = Collection::fromString($data);
+
         return $collection->records->toArray()[0];
     }
 
@@ -58,7 +60,7 @@ public function getType()
             case 'y': // Serial item holdings
                 return 'Holdings';
             default:
-                throw new \ErrorException("Unknown record type.");
+                throw new \ErrorException('Unknown record type.');
         }
     }
 
@@ -73,10 +75,11 @@ public function getIsbns()
         foreach ($this->record->getFields('020') as $field) {
             $fields[] = $this->makeField('Isbn', $field);
         }
+
         return $fields;
     }
 
-    public function getSubjects($vocabulary=null, $type=null)
+    public function getSubjects($vocabulary = null, $type = null)
     {
         $fields = array();
         $saf = array(
@@ -103,16 +106,19 @@ public function getSubjects($vocabulary=null, $type=null)
                 $fields[] = $f;
             }
         }
+
         return array_filter($fields, function ($s) use ($vocabulary, $type) {
             $a = is_null($vocabulary) || $vocabulary == $s->vocabulary;
             $b = is_null($type) || $type == $s->type;
+
             return $a && $b;
         });
     }
 
     public function getTitle()
     {
         $field = $this->record->getField('245');
+
         return $field ? $this->makeField('Title', $field) : null;
     }
 
@@ -128,6 +134,7 @@ protected function makeField($model, \File_MARC_Field $field)
     public function get($spec)
     {
         $reference = new \File_MARC_Reference($spec, $this->record);
+
         return $reference ?: array();
     }
 

src/Records.php

@@ -22,6 +22,7 @@ public function toArray()
             $records[] = $this->current();
             $this->next();
         }
+
         return $records;
     }
 
@@ -44,7 +45,7 @@ public function key()
 
     public function next()
     {
-        $this->position++;
+        ++$this->position;
         if ($this->useCache) {
             $rec = isset($this->records[$this->position]) ? $this->records[$this->position] : false;
         } else {

tests/RecordTest.php

@@ -1,7 +1,6 @@
 <?php
 
 use Scriptotek\Marc\Record;
-use Scriptotek\Marc\Collection;
 
 class RecordTest extends \PHPUnit_Framework_TestCase
 {