refactor: Improve code quality

Author: danmichaelo

src/Exceptions/XmlException.php

@@ -2,11 +2,13 @@
 
 namespace Scriptotek\Marc\Exceptions;
 
+use LibXMLError;
+
 class XmlException extends \RuntimeException
 {
-    public function __construct($errors)
+    public function __construct(array $errors)
     {
-        $details = array_map(function ($error) {
+        $details = array_map(function (LibXMLError $error) {
             return $error->message;
         }, $errors);
         parent::__construct('Failed loading XML: \n' . implode('\n', $details));

src/Factory.php

@@ -4,7 +4,7 @@
 
 class Factory
 {
-    protected function _make($className, $args)
+    protected function genMake($className, $args)
     {
         $reflectionClass = new \ReflectionClass($className);
         $instance = $reflectionClass->newInstanceArgs($args);
@@ -17,14 +17,14 @@ public function make()
         $args = func_get_args();
         $className = array_shift($args);
 
-        return $this->_make($className, $args);
+        return $this->genMake($className, $args);
     }
 
     public function makeField()
     {
         $args = func_get_args();
         $className = 'Scriptotek\\Marc\\Fields\\' . array_shift($args);
 
-        return $this->_make($className, $args);
+        return $this->genMake($className, $args);
     }
 }

src/Fields/Title.php

@@ -46,8 +46,6 @@ public function __toString()
         // (for instance when the title is an abbreviation)
         $title = rtrim($title, ' /');
 
-        // TODO: Handle more subfields like $k, $f and $g ?? Probably should...
-
         return $title;
     }
 }

src/Importers/XmlImporter.php

@@ -6,10 +6,13 @@
 use Scriptotek\Marc\Collection;
 use Scriptotek\Marc\Exceptions\XmlException;
 use Scriptotek\Marc\Factory;
+use SimpleXMLElement;
 
 class XmlImporter
 {
     protected $factory;
+
+    /* var SimpleXMLElement */
     protected $source;
 
     public function __construct($data, $ns = '', $isPrefix = false, $factory = null)
@@ -76,7 +79,7 @@ public function getCollection()
         list($prefix, $ns) = $this->getMarcNamespace($records[0]->getNamespaces(true));
         $pprefix = empty($prefix) ? '' : "$prefix:";
 
-        $records = array_map(function ($record) {
+        $records = array_map(function (SimpleXMLElement $record) {
             $x = $record->asXML();
 
             // Strip away XML declaration.

src/Record.php

@@ -180,7 +180,7 @@ public function getTitle()
      */
     public function getSubjects($vocabulary = null, $tag = null)
     {
-        return array_filter(Subject::get($this), function ($field) use ($vocabulary, $tag) {
+        return array_filter(Subject::get($this), function (Subject $field) use ($vocabulary, $tag) {
             $a = is_null($vocabulary) || $vocabulary == $field->vocabulary;
             $b = is_null($tag) || $tag == $field->type;