Merge pull request #2 from Shardj/master

Merge upstream changes into MittagQI Fork
MittagQI · Jul 24, 2019 · 5cc629b · 5cc629b
2 parents e09ea01 + 4c70923
commit 5cc629b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
 Post end of life changes for zf1 to allow compatibility with PHP 7.3, and potentially future versions
 
 If you have any requests for tags, releases, or anything else. Feel free to raise an issue and I'll get it sorted.
+
+Installable through git clone or through `composer install zf1-future` https://packagist.org/packages/shardj/zf1-future
diff --git a/library/Zend/Pdf/FileParser/Font/OpenType.php b/library/Zend/Pdf/FileParser/Font/OpenType.php
@@ -890,15 +890,14 @@ protected function _parseCmapTable()
             $cmapOffset = $baseOffset + $offset;
             $this->moveToOffset($cmapOffset);
             $format = $this->readUInt(2);
-            $language = -1;
             switch ($format) {
                 case 0x0:
                     $cmapLength = $this->readUInt(2);
                     $language = $this->readUInt(2);
                     if ($language != 0) {
                         $this->_debugLog('Type 0 cmap tables must be language-independent;'
                                          . ' language: %d; skipping', $language);
-                        continue;
+                        continue 2;
                     }
                     break;
 
@@ -917,7 +916,7 @@ protected function _parseCmapTable()
                 case 0xa:    // break intentionally omitted
                 case 0xc:
                     $this->_debugLog('Format: 0x%x currently unsupported; skipping', $format);
-                    continue;
+                    continue 2;
                     //$this->skipBytes(2);
                     //$cmapLength = $this->readUInt(4);
                     //$language = $this->readUInt(4);
@@ -929,7 +928,7 @@ protected function _parseCmapTable()
 
                 default:
                     $this->_debugLog('Unknown subtable format: 0x%x; skipping', $format);
-                    continue;
+                    continue 2;
             }
             $cmapType = $format;
             break;

diff --git a/library/Zend/Reflection/File.php b/library/Zend/Reflection/File.php
@@ -355,7 +355,7 @@ protected function _reflect()
                 case T_DOLLAR_OPEN_CURLY_BRACES:
                 case T_CURLY_OPEN:
                     $embeddedVariableTrapped = true;
-                    continue;
+                    break;
 
                 // Name of something
                 case T_STRING:
@@ -366,15 +366,15 @@ protected function _reflect()
                         $this->_classes[] = $value;
                         $classTrapped = false;
                     }
-                    continue;
+                    break;
 
                 // Required file names are T_CONSTANT_ENCAPSED_STRING
                 case T_CONSTANT_ENCAPSED_STRING:
                     if ($requireTrapped) {
                         $this->_requiredFiles[] = $value ."\n";
                         $requireTrapped = false;
                     }
-                    continue;
+                    break;
 
                 // Functions
                 case T_FUNCTION: