Change class names to respect the PSR-0 rules

PhenX · PhenX · commit 3a19c35edee9 · 2015-05-06T22:01:16.000+02:00
diff --git a/src/FontLib/AdobeFontMetrics.php b/src/FontLib/AdobeFontMetrics.php
@@ -16,7 +16,7 @@
  *
  * @package php-font-lib
  */
-class Adobe_Font_Metrics {
+class AdobeFontMetrics {
   private $f;
 
   /**
@@ -38,7 +38,7 @@ function write($file, $encoding = null) {
         throw new \Exception("Unkown encoding ($encoding)");
       }
 
-      $map      = new Encoding_Map($map_file);
+      $map      = new EncodingMap($map_file);
       $map_data = $map->parse();
     }
 
diff --git a/src/FontLib/BinaryStream.php b/src/FontLib/BinaryStream.php
@@ -13,7 +13,7 @@
  *
  * @package php-font-lib
  */
-class Binary_Stream {
+class BinaryStream {
   /**
    * @var resource The file pointer
    */
diff --git a/src/FontLib/EOT/File.php b/src/FontLib/EOT/File.php
@@ -61,9 +61,13 @@ function parse() {
     // TODO Read font data ...
   }
 
-  /**
-   * Little endian version of the read method
-   */
+    /**
+     * Little endian version of the read method
+     *
+     * @param int $n The number of bytes to read
+     *
+     * @return string
+     */
   public function read($n) {
     if ($n < 1) {
       return "";
diff --git a/src/FontLib/EncodingMap.php b/src/FontLib/EncodingMap.php
@@ -13,7 +13,7 @@
  *
  * @package php-font-lib
  */
-class Encoding_Map {
+class EncodingMap {
   private $f;
 
   function __construct($file) {
@@ -24,7 +24,7 @@ function parse() {
     $map = array();
 
     while ($line = fgets($this->f)) {
-      if (preg_match("/^[\!\=]([0-9A-F]{2,})\s+U\+([0-9A-F]{2})([0-9A-F]{2})\s+([^\s]+)/", $line, $matches)) {
+      if (preg_match('/^[\!\=]([0-9A-F]{2,})\s+U\+([0-9A-F]{2})([0-9A-F]{2})\s+([^\s]+)/', $line, $matches)) {
         $unicode = (hexdec($matches[2]) << 8) + hexdec($matches[3]);
         $map[hexdec($matches[1])] = array($unicode, $matches[4]);
       }
diff --git a/src/FontLib/Glyph/Outline.php b/src/FontLib/Glyph/Outline.php
@@ -10,14 +10,14 @@
 
 use FontLib\Table\Type\glyf;
 use FontLib\TrueType\File;
-use FontLib\Binary_Stream;
+use FontLib\BinaryStream;
 
 /**
  * `glyf` font table.
  *
  * @package php-font-lib
  */
-class Outline extends Binary_Stream {
+class Outline extends BinaryStream {
   /**
    * @var \FontLib\Table\Type\glyf
    */
@@ -47,12 +47,12 @@ static function init(glyf $table, $offset, $size) {
     $font->seek($offset);
 
     if ($font->readInt16() > -1) {
-      /** @var Outline_Simple $glyph */
-      $glyph = new Outline_Simple($table, $offset, $size);
+      /** @var OutlineSimple $glyph */
+      $glyph = new OutlineSimple($table, $offset, $size);
     }
     else {
-      /** @var Outline_Composite $glyph */
-      $glyph = new Outline_Composite($table, $offset, $size);
+      /** @var OutlineComposite $glyph */
+      $glyph = new OutlineComposite($table, $offset, $size);
     }
 
     $glyph->parse();
diff --git a/src/FontLib/Glyph/OutlineComponent.php b/src/FontLib/Glyph/OutlineComponent.php
@@ -13,7 +13,7 @@
  *
  * @package php-font-lib
  */
-class Outline_Component {
+class OutlineComponent {
   public $flags;
   public $glyphIndex;
   public $a, $b, $c, $d, $e, $f;
diff --git a/src/FontLib/Glyph/OutlineComposite.php b/src/FontLib/Glyph/OutlineComposite.php
@@ -9,14 +9,12 @@
 
 namespace FontLib\Glyph;
 
-use FontLib\Table\Type\glyf;
-
 /**
  * Composite glyph outline
  *
  * @package php-font-lib
  */
-class Outline_Composite extends Outline {
+class OutlineComposite extends Outline {
   const ARG_1_AND_2_ARE_WORDS    = 0x0001;
   const ARGS_ARE_XY_VALUES       = 0x0002;
   const ROUND_XY_TO_GRID         = 0x0004;
@@ -29,7 +27,7 @@ class Outline_Composite extends Outline {
   const OVERLAP_COMPOUND         = 0x0400;
 
   /**
-   * @var Outline_Component[]
+   * @var OutlineComponent[]
    */
   public $components = array();
 
@@ -113,7 +111,7 @@ function parseData() {
       //
       //}
 
-      $component                  = new Outline_Component();
+      $component                  = new OutlineComponent();
       $component->flags           = $flags;
       $component->glyphIndex      = $glyphIndex;
       $component->a               = $a;
@@ -219,7 +217,7 @@ function encode() {
   public function getSVGContours() {
     $contours = array();
 
-    /** @var \FontLib\Table\\FontLib\Table\Type\glyf $glyph_data */
+    /** @var \FontLib\Table\Type\glyf $glyph_data */
     $glyph_data = $this->getFont()->getTableObject("glyf");
 
     /** @var Outline[] $glyphs */
diff --git a/src/FontLib/Glyph/OutlineSimple.php b/src/FontLib/Glyph/OutlineSimple.php
@@ -14,7 +14,7 @@
  *
  * @package php-font-lib
  */
-class Outline_Simple extends Outline {
+class OutlineSimple extends Outline {
   const ON_CURVE       = 0x01;
   const X_SHORT_VECTOR = 0x02;
   const Y_SHORT_VECTOR = 0x04;
diff --git a/src/FontLib/Header.php b/src/FontLib/Header.php
@@ -14,7 +14,7 @@
  *
  * @package php-font-lib
  */
-abstract class Header extends Binary_Stream {
+abstract class Header extends BinaryStream {
   /**
    * @var File
    */
diff --git a/src/FontLib/OpenType/TableDirectoryEntry.php b/src/FontLib/OpenType/TableDirectoryEntry.php
@@ -13,6 +13,6 @@
  *
  * @package php-font-lib
  */
-class Table_Directory_Entry extends \FontLib\TrueType\Table_Directory_Entry {
+class TableDirectoryEntry extends \FontLib\TrueType\TableDirectoryEntry {
 
 }
diff --git a/src/FontLib/Table/DirectoryEntry.php b/src/FontLib/Table/DirectoryEntry.php
@@ -9,14 +9,14 @@
 
 use FontLib\TrueType\File;
 use FontLib\Font;
-use FontLib\Binary_Stream;
+use FontLib\BinaryStream;
 
 /**
  * Generic Font table directory entry.
  *
  * @package php-font-lib
  */
-class Directory_Entry extends Binary_Stream {
+class DirectoryEntry extends BinaryStream {
   /**
    * @var File
    */
diff --git a/src/FontLib/Table/Table.php b/src/FontLib/Table/Table.php
@@ -9,23 +9,23 @@
 
 use FontLib\TrueType\File;
 use FontLib\Font;
-use FontLib\Binary_Stream;
+use FontLib\BinaryStream;
 
 /**
  * Generic font table.
  *
  * @package php-font-lib
  */
-class Table extends Binary_Stream {
+class Table extends BinaryStream {
   /**
-   * @var Directory_Entry
+   * @var DirectoryEntry
    */
   protected $entry;
   protected $def = array();
 
   public $data;
 
-  final public function __construct(Directory_Entry $entry) {
+  final public function __construct(DirectoryEntry $entry) {
     $this->entry = $entry;
     $entry->setTable($this);
   }
diff --git a/src/FontLib/Table/Type/glyf.php b/src/FontLib/Table/Type/glyf.php
@@ -10,7 +10,7 @@
 
 use FontLib\Table\Table;
 use FontLib\Glyph\Outline;
-use FontLib\Glyph\Outline_Simple;
+use FontLib\Glyph\OutlineSimple;
 
 /**
  * `glyf` font table.
@@ -106,7 +106,7 @@ public function toHTML() {
       );
       $shape_json = json_encode($shape);
 
-      $type = ($glyph instanceof Outline_Simple ? "simple" : "composite");
+      $type = ($glyph instanceof OutlineSimple ? "simple" : "composite");
       $char = isset($glyphIndexArray[$g]) ? $glyphIndexArray[$g] : 0;
       $name = isset($names[$g]) ? $names[$g] : sprintf("uni%04x", $char);
       $char = $char ? "&#{$glyphIndexArray[$g]};" : "";
diff --git a/src/FontLib/Table/Type/name.php b/src/FontLib/Table/Type/name.php
@@ -143,8 +143,8 @@ protected function _parse() {
 
     $records = array();
     for ($i = 0; $i < $data["count"]; $i++) {
-      $record      = new name_Record();
-      $record_data = $font->unpack(name_Record::$format);
+      $record      = new nameRecord();
+      $record_data = $font->unpack(nameRecord::$format);
       $record->map($record_data);
 
       $records[] = $record;
@@ -166,7 +166,7 @@ protected function _parse() {
   protected function _encode() {
     $font = $this->getFont();
 
-    /** @var name_Record[] $records */
+    /** @var nameRecord[] $records */
     $records       = $this->data["records"];
     $count_records = count($records);
 
@@ -180,7 +180,7 @@ protected function _encode() {
       $record->length = mb_strlen($record->getUTF16(), "8bit");
       $record->offset = $offset;
       $offset += $record->length;
-      $length += $font->pack(name_Record::$format, (array)$record);
+      $length += $font->pack(nameRecord::$format, (array)$record);
     }
 
     foreach ($records as $record) {
diff --git a/src/FontLib/Table/Type/nameRecord.php b/src/FontLib/Table/Type/nameRecord.php
@@ -8,14 +8,14 @@
 namespace FontLib\Table\Type;
 
 use FontLib\Font;
-use FontLib\Binary_Stream;
+use FontLib\BinaryStream;
 
 /**
  * Font table name record.
  *
  * @package php-font-lib
  */
-class name_Record extends Binary_Stream {
+class nameRecord extends BinaryStream {
   public $platformID;
   public $platformSpecificID;
   public $languageID;
diff --git a/src/FontLib/TrueType/Collection.php b/src/FontLib/TrueType/Collection.php
@@ -9,7 +9,7 @@
 namespace FontLib\TrueType;
 
 use Countable;
-use FontLib\Binary_Stream;
+use FontLib\BinaryStream;
 use Iterator;
 use OutOfBoundsException;
 
@@ -18,7 +18,7 @@
  *
  * @package php-font-lib
  */
-class Collection extends Binary_Stream implements Iterator, Countable {
+class Collection extends BinaryStream implements Iterator, Countable {
   /**
    * Current iterator position.
    *
diff --git a/src/FontLib/TrueType/File.php b/src/FontLib/TrueType/File.php
@@ -8,21 +8,21 @@
 
 namespace FontLib\TrueType;
 
-use FontLib\Adobe_Font_Metrics;
+use FontLib\AdobeFontMetrics;
 use FontLib\Font;
-use FontLib\Binary_Stream;
+use FontLib\BinaryStream;
 use FontLib\Table\Table;
-use FontLib\Table\Directory_Entry;
+use FontLib\Table\DirectoryEntry;
 use FontLib\Table\Type\glyf;
 use FontLib\Table\Type\name;
-use FontLib\Table\Type\name_Record;
+use FontLib\Table\Type\nameRecord;
 
 /**
  * TrueType font file.
  *
  * @package php-font-lib
  */
-class File extends Binary_Stream {
+class File extends BinaryStream {
   /**
    * @var Header
    */
@@ -228,7 +228,7 @@ function encode($tags = array()) {
 
     Font::d("Tables : " . implode(", ", $tags));
 
-    /** @var Directory_Entry[] $entries */
+    /** @var DirectoryEntry[] $entries */
     $entries = array();
     foreach ($tags as $tag) {
       if (!isset($this->directory[$tag])) {
@@ -282,10 +282,10 @@ function parseTableEntries() {
 
 
     $type = $this->getFontType();
-    $class = "FontLib\\$type\\Table_Directory_Entry";
+    $class = "FontLib\\$type\\TableDirectoryEntry";
 
     for ($i = 0; $i < $this->header->data["numTables"]; $i++) {
-      /** @var Table_Directory_Entry $entry */
+      /** @var TableDirectoryEntry $entry */
       $entry = new $class($this);
       $entry->parse();
 
@@ -352,12 +352,12 @@ public function getData($name, $key = null) {
     }
   }
 
-  function addDirectoryEntry(Directory_Entry $entry) {
+  function addDirectoryEntry(DirectoryEntry $entry) {
     $this->directory[$entry->tag] = $entry;
   }
 
   function saveAdobeFontMetrics($file, $encoding = null) {
-    $afm = new Adobe_Font_Metrics($this);
+    $afm = new AdobeFontMetrics($this);
     $afm->write($file, $encoding);
   }
 
@@ -369,7 +369,7 @@ function saveAdobeFontMetrics($file, $encoding = null) {
    * @return string|null
    */
   function getNameTableString($nameID) {
-    /** @var name_Record[] $records */
+    /** @var nameRecord[] $records */
     $records = $this->getData("name", "records");
 
     if (!isset($records[$nameID])) {
diff --git a/src/FontLib/TrueType/TableDirectoryEntry.php b/src/FontLib/TrueType/TableDirectoryEntry.php
@@ -8,14 +8,14 @@
 
 namespace FontLib\TrueType;
 
-use FontLib\Table\Directory_Entry;
+use FontLib\Table\DirectoryEntry;
 
 /**
  * TrueType table directory entry.
  *
  * @package php-font-lib
  */
-class Table_Directory_Entry extends Directory_Entry {
+class TableDirectoryEntry extends DirectoryEntry {
   function __construct(File $font) {
     parent::__construct($font);
   }
diff --git a/src/FontLib/WOFF/File.php b/src/FontLib/WOFF/File.php
diff --git a/src/FontLib/WOFF/TableDirectoryEntry.php b/src/FontLib/WOFF/TableDirectoryEntry.php
diff --git a/www/make_subset.php b/www/make_subset.php
diff --git a/www/test.php b/www/test.php

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`* @package php-font-lib`
`18`	`18`	`*/`
`19`		`-class Adobe_Font_Metrics {`
	`19`	`+class AdobeFontMetrics {`
`20`	`20`	`private $f;`
`21`	`21`
`22`	`22`	`/**`
`@@ -38,7 +38,7 @@ function write($file, $encoding = null) {`
`38`	`38`	`throw new \Exception("Unkown encoding ($encoding)");`
`39`	`39`	`}`
`40`	`40`
`41`		`- $map = new Encoding_Map($map_file);`
	`41`	`+ $map = new EncodingMap($map_file);`
`42`	`42`	`$map_data = $map->parse();`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`* @package php-font-lib`
`15`	`15`	`*/`
`16`		`-class Binary_Stream {`
	`16`	`+class BinaryStream {`
`17`	`17`	`/**`
`18`	`18`	`* @var resource The file pointer`
`19`	`19`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`* @package php-font-lib`
`16`	`16`	`*/`
`17`		`-class Outline_Simple extends Outline {`
	`17`	`+class OutlineSimple extends Outline {`
`18`	`18`	`const ON_CURVE = 0x01;`
`19`	`19`	`const X_SHORT_VECTOR = 0x02;`
`20`	`20`	`const Y_SHORT_VECTOR = 0x04;`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@`
`13`	`13`	`*`
`14`	`14`	`* @package php-font-lib`
`15`	`15`	`*/`
`16`		`-class Table_Directory_Entry extends \FontLib\TrueType\Table_Directory_Entry {`
	`16`	`+class TableDirectoryEntry extends \FontLib\TrueType\TableDirectoryEntry {`
`17`	`17`
`18`	`18`	`}`