cleanup: Remove code not in use + cs fixes

Author: danmichaelo

src/Fields/Field.php

@@ -43,7 +43,7 @@ public static function makeFieldObject(Record $record, $tag, $pcre=false)
 
     public static function makeFieldObjects(Record $record, $tag, $pcre=false)
     {
-        return array_map(function($field) {
+        return array_map(function ($field) {
             return new self($field);
         }, $record->getFields($tag, $pcre));
     }

src/Fields/Subject.php

@@ -35,7 +35,8 @@ class Subject extends Field implements FieldInterface
         // 7: Source specified in subfield $2
     );
 
-    public static function get(Record $record) {
+    public static function get(Record $record)
+    {
         return parent::makeFieldObjects($record, '6..', true);
     }
 

src/Record.php

@@ -14,19 +14,20 @@
 class Record
 {
     protected $record;
-    protected $factory;
 
     /**
      * Record constructor.
      * @param File_MARC_Record $record
-     * @param Factory|null $factory
      */
-    public function __construct(File_MARC_Record $record, Factory $factory = null)
+    public function __construct(File_MARC_Record $record)
     {
         $this->record = $record;
-        $this->factory = $factory ?: new Factory();
     }
 
+    /*************************************************************************
+     * Data loading
+     *************************************************************************/
+
     /**
      * Returns the first record found in the file $filename, or null if no records found.
      *
@@ -62,7 +63,20 @@ public static function fromString($data)
     }
 
     /*************************************************************************
-     * Determine if record is a bibliographic, authority or holdings record
+     * Query
+     *************************************************************************/
+
+    /**
+     * @param string $spec  The MARCspec string
+     * @return QueryResult
+     */
+    public function query($spec)
+    {
+        return new QueryResult(new File_MARC_Reference($spec, $this->record));
+    }
+
+    /*************************************************************************
+     * Helper methods for LDR
      *************************************************************************/
 
     /**
@@ -129,7 +143,7 @@ public function getCatalogingForm()
     /**
      * Get the value of the 001 field as a `ControlField` object.
      *
-     * @return Title
+     * @return ControlField
      */
     public function getId()
     {
@@ -178,20 +192,6 @@ public function getSubjects($vocabulary = null, $tag = null)
      * Support methods
      *************************************************************************/
 
-    protected function makeField($model, \File_MARC_Field $field)
-    {
-        return $this->factory->makeField($model, $field);
-    }
-
-    /**
-     * @param string $spec  The MARCspec string
-     * @return QueryResult
-     */
-    public function query($spec)
-    {
-        return new QueryResult(new File_MARC_Reference($spec, $this->record));
-    }
-
     public function __call($name, $args)
     {
         return call_user_func_array(array($this->record, $name), $args);