vakata / asn1

src/structures/TimestampRequest.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
      */
     public static function generateFromData($data, $nonce = true, $requireCert = false, $alg = 'sha1', $policy = null)
     {
-        if (!in_array($alg, ['sha1', 'sha256', 'sha384', 'sha512', 'md5'])) {
+        if (!in_array($alg, [ 'sha1', 'sha256', 'sha384', 'sha512', 'md5' ])) {
             throw new TimestampException('Unsupported hash algorithm');
         }
         $hash = hash($alg, $data, true);
@@ -68,7 +68,7 @@ 
      */
     public static function generateFromHash($data, $nonce = true, $requireCert = false, $alg = 'sha1', $policy = null)
     {
-        if (!in_array($alg, ['sha1', 'sha256', 'sha384', 'sha512', 'md5'])) {
+        if (!in_array($alg, [ 'sha1', 'sha256', 'sha384', 'sha512', 'md5' ])) {
             throw new ASN1Exception('Unsupported hash algorithm');
         }
         if ($nonce === true) {
@@ -99,7 +99,7 @@ 
             'children' => [
                 'version' => [
                     'tag' => ASN1::TYPE_INTEGER,
-                    'map' => [1=>'v1','v2','v3']
+                    'map' => [ 1=>'v1', 'v2', 'v3' ]
                 ],
                 'reqPolicy' => [
                     'tag' => ASN1::TYPE_OBJECT_IDENTIFIER,

src/Decoder.php

Spacing +147 added lines, -148 removed lines

@@ -100,36 +100,35 @@ 
     }
     protected function decode($header)
     {
-        $contents = $header['content_length'] > 0 ?
-            $this->reader->chunk($header['content_start'], $header['content_length']) :
-            '';
-        if ($header['class'] !== ASN1::CLASS_UNIVERSAL) {
+        $contents = $header[ 'content_length' ] > 0 ?
+            $this->reader->chunk($header[ 'content_start' ], $header[ 'content_length' ]) : '';
+        if ($header[ 'class' ] !== ASN1::CLASS_UNIVERSAL) {
             return $contents;
         }
-        switch ($header['tag']) {
+        switch ($header[ 'tag' ]) {
             case ASN1::TYPE_BOOLEAN:
-                return (bool)ord($contents[0]);
+                return (bool) ord($contents[ 0 ]);
             case ASN1::TYPE_INTEGER:
                 return ASN1::fromBase256($contents);
             case ASN1::TYPE_ENUMERATED:
-                return (int)base_convert(ASN1::fromBase256($contents), 2, 10);
+                return (int) base_convert(ASN1::fromBase256($contents), 2, 10);
             case ASN1::TYPE_REAL:
                 // TODO: read the specs
                 return false;
             case ASN1::TYPE_BIT_STRING:
-                if ($header['constructed']) {
+                if ($header[ 'constructed' ]) {
                     $temp = static::fromString($contents)->values();
                     $real = '';
                     for ($i = 0; $i < count($temp) - 1; $i++) {
-                        $real .= $temp['value'];
+                        $real .= $temp[ 'value' ];
                     }
-                    return $temp[count($temp) - 1]['value'][0] . $real . substr($temp[$i]['value'], 1);
+                    return $temp[ count($temp) - 1 ][ 'value' ][ 0 ].$real.substr($temp[ $i ][ 'value' ], 1);
                 }
                 return $contents;
             case ASN1::TYPE_OCTET_STRING:
-                if ($header['constructed']) {
-                    return implode('', array_map(function ($v) {
-                        return $v['value'];
+                if ($header[ 'constructed' ]) {
+                    return implode('', array_map(function($v) {
+                        return $v[ 'value' ];
                     }, static::fromString($contents)->values()));
                 }
                 return $contents;
@@ -137,14 +136,14 @@ 
                 return null;
             case ASN1::TYPE_UTC_TIME:
                 $format = 'YmdHis';
-                $matches = [];
+                $matches = [ ];
                 if (preg_match('#^(\d{10})(Z|[+-]\d{4})$#', $contents, $matches)) {
-                    $contents = $matches[1] . '00' . $matches[2];
+                    $contents = $matches[ 1 ].'00'.$matches[ 2 ];
                 }
                 $prefix = substr($contents, 0, 2) >= 50 ? '19' : '20';
-                $contents = $prefix . $contents;
-                if ($contents[strlen($contents) - 1] == 'Z') {
-                    $contents = substr($contents, 0, -1) . '+0000';
+                $contents = $prefix.$contents;
+                if ($contents[ strlen($contents) - 1 ] == 'Z') {
+                    $contents = substr($contents, 0, -1).'+0000';
                 }
                 if (strpos($contents, '-') !== false || strpos($contents, '+') !== false) {
                     $format .= 'O';
@@ -156,8 +155,8 @@ 
                 if (strpos($contents, '.') !== false) {
                     $format .= '.u';
                 }
-                if ($contents[strlen($contents) - 1] == 'Z') {
-                    $contents = substr($contents, 0, -1) . '+0000';
+                if ($contents[ strlen($contents) - 1 ] == 'Z') {
+                    $contents = substr($contents, 0, -1).'+0000';
                 }
                 if (strpos($contents, '-') !== false || strpos($contents, '+') !== false) {
                     $format .= 'O';
@@ -165,16 +164,16 @@ 
                 $result = @DateTime::createFromFormat($format, $contents);
                 return $result ? $result->getTimestamp() : false;
             case ASN1::TYPE_OBJECT_IDENTIFIER:
-                $temp = ord($contents[0]);
+                $temp = ord($contents[ 0 ]);
                 $real = sprintf('%d.%d', floor($temp / 40), $temp % 40);
                 $obid = 0;
                 // process septets
                 for ($i = 1; $i < strlen($contents); $i++) {
-                    $temp = ord($contents[$i]);
+                    $temp = ord($contents[ $i ]);
                     $obid <<= 7;
                     $obid |= $temp & 0x7F;
                     if (~$temp & 0x80) {
-                        $real .= '.' . $obid;
+                        $real .= '.'.$obid;
                         $obid = 0;
                     }
                 }
@@ -191,51 +190,51 @@ 
      */
     public function structure($max = null)
     {
-        $skeleton = [];
+        $skeleton = [ ];
         while (!$this->reader->eof() && ($max === null || $this->reader->pos() < $max)) {
             $header = $this->header();
-            if ($header['class'] === 0 && $header['tag'] === 0) {
+            if ($header[ 'class' ] === 0 && $header[ 'tag' ] === 0) {
                 if ($max === null) {
                     break;
                 } else {
                     continue;
                 }
             }
-            if ($header['class'] !== ASN1::CLASS_UNIVERSAL && $header['constructed']) {
-                $header['children'] = $this->structure($header['length'] ? $header['start'] + $header['length'] - 1 : null);
-                if ($header['length'] === null) {
+            if ($header[ 'class' ] !== ASN1::CLASS_UNIVERSAL && $header[ 'constructed' ]) {
+                $header[ 'children' ] = $this->structure($header[ 'length' ] ? $header[ 'start' ] + $header[ 'length' ] - 1 : null);
+                if ($header[ 'length' ] === null) {
                     $this->reader->byte();
-                    $header['length'] = $this->reader->pos() - $header['start'];
-                    $header['content_length'] = $this->reader->pos() - $header['content_start'];
+                    $header[ 'length' ] = $this->reader->pos() - $header[ 'start' ];
+                    $header[ 'content_length' ] = $this->reader->pos() - $header[ 'content_start' ];
                 }
-                $skeleton[] = $header;
+                $skeleton[ ] = $header;
             } else {
-                if ($header['class'] === ASN1::CLASS_UNIVERSAL &&
-                    in_array($header['tag'], [ASN1::TYPE_SET, ASN1::TYPE_SEQUENCE])
+                if ($header[ 'class' ] === ASN1::CLASS_UNIVERSAL &&
+                    in_array($header[ 'tag' ], [ ASN1::TYPE_SET, ASN1::TYPE_SEQUENCE ])
                 ) {
-                    $header['children'] = $this->structure($header['length'] ? $header['start'] + $header['length'] - 1 : null);
-                    if ($header['length'] === null) {
+                    $header[ 'children' ] = $this->structure($header[ 'length' ] ? $header[ 'start' ] + $header[ 'length' ] - 1 : null);
+                    if ($header[ 'length' ] === null) {
                         $this->reader->byte();
-                        $header['length'] = $this->reader->pos() - $header['start'];
-                        $header['content_length'] = $this->reader->pos() - $header['content_start'];
+                        $header[ 'length' ] = $this->reader->pos() - $header[ 'start' ];
+                        $header[ 'content_length' ] = $this->reader->pos() - $header[ 'content_start' ];
                     }
                 } else {
-                    if ($header['length'] === null) {
+                    if ($header[ 'length' ] === null) {
                         $this->reader->readUntil(chr(0).chr(0));
-                        $header['length'] = $this->reader->pos() - $header['start'];
-                        $header['content_length'] = $this->reader->pos() - $header['content_start'];
+                        $header[ 'length' ] = $this->reader->pos() - $header[ 'start' ];
+                        $header[ 'content_length' ] = $this->reader->pos() - $header[ 'content_start' ];
                     } else {
-                        if ($header['content_length'] > 0) {
-                            $this->reader->bytes($header['content_length']);
+                        if ($header[ 'content_length' ] > 0) {
+                            $this->reader->bytes($header[ 'content_length' ]);
                         }
                     }
                 }
-                if (!isset($header['children'])) {
+                if (!isset($header[ 'children' ])) {
                     $pos = $this->reader->pos();
-                    $header['value'] = $this->decode($header);
+                    $header[ 'value' ] = $this->decode($header);
                     $this->reader->seek($pos);
                 }
-                $skeleton[] = $header;
+                $skeleton[ ] = $header;
             }
         }
         return $skeleton;
@@ -250,10 +249,10 @@ 
     {
         $skeleton = $skeleton ?? $this->structure();
         foreach ($skeleton as $k => $v) {
-            if (isset($v['children'])) {
-                $skeleton[$k] = $this->values($v['children']);
+            if (isset($v[ 'children' ])) {
+                $skeleton[ $k ] = $this->values($v[ 'children' ]);
             } else {
-                $skeleton[$k] = $v['value'] ?? null;
+                $skeleton[ $k ] = $v[ 'value' ] ?? null;
             }
         }
         return $skeleton;
@@ -270,174 +269,174 @@ 
         if ($skeleton === null && $this->reader->pos() !== 0) {
             $this->reader->rewind();
         }
-        $skeleton = $skeleton ?? $this->structure()[0];
-        if ($skeleton['class'] !== ASN1::CLASS_UNIVERSAL) {
-            if ($map['tag'] === ASN1::TYPE_CHOICE) {
-                foreach ($map['children'] as $child) {
-                    if (isset($child['name']) && (int)$skeleton['tag'] === (int)$child['name']) {
+        $skeleton = $skeleton ?? $this->structure()[ 0 ];
+        if ($skeleton[ 'class' ] !== ASN1::CLASS_UNIVERSAL) {
+            if ($map[ 'tag' ] === ASN1::TYPE_CHOICE) {
+                foreach ($map[ 'children' ] as $child) {
+                    if (isset($child[ 'name' ]) && (int) $skeleton[ 'tag' ] === (int) $child[ 'name' ]) {
                         $map = $child;
-                        if (isset($child['value']) && $child['value']) {
-                            return $child['value'];
+                        if (isset($child[ 'value' ]) && $child[ 'value' ]) {
+                            return $child[ 'value' ];
                         }
                         break;
                     }
                 }
             }
         }
-        if ($skeleton['class'] !== ASN1::CLASS_UNIVERSAL) {
-            if (isset($map['implicit']) && $map['implicit']) {
-                $skeleton['class'] = ASN1::CLASS_UNIVERSAL;
-                $skeleton['tag'] = $map['tag'];
+        if ($skeleton[ 'class' ] !== ASN1::CLASS_UNIVERSAL) {
+            if (isset($map[ 'implicit' ]) && $map[ 'implicit' ]) {
+                $skeleton[ 'class' ] = ASN1::CLASS_UNIVERSAL;
+                $skeleton[ 'tag' ] = $map[ 'tag' ];
             } else {
-                $skeleton = $skeleton['children'][0] ?? null;
+                $skeleton = $skeleton[ 'children' ][ 0 ] ?? null;
             }
         }
-        if ($map['tag'] === ASN1::TYPE_CHOICE) {
-            foreach ($map['children'] as $child) {
-                if ($skeleton['tag'] === $child['tag']) {
+        if ($map[ 'tag' ] === ASN1::TYPE_CHOICE) {
+            foreach ($map[ 'children' ] as $child) {
+                if ($skeleton[ 'tag' ] === $child[ 'tag' ]) {
                     $map = $child;
-                    if (isset($child['value']) && $child['value']) {
-                        return $child['value'];
+                    if (isset($child[ 'value' ]) && $child[ 'value' ]) {
+                        return $child[ 'value' ];
                     }
                     break;
                 }
             }
         }
-        if (in_array($map['tag'], [ASN1::TYPE_SEQUENCE, ASN1::TYPE_SET]) &&
-            in_array($skeleton['tag'], [ASN1::TYPE_SEQUENCE, ASN1::TYPE_SET])) {
-            $map['tag'] = $skeleton['tag'];
+        if (in_array($map[ 'tag' ], [ ASN1::TYPE_SEQUENCE, ASN1::TYPE_SET ]) &&
+            in_array($skeleton[ 'tag' ], [ ASN1::TYPE_SEQUENCE, ASN1::TYPE_SET ])) {
+            $map[ 'tag' ] = $skeleton[ 'tag' ];
         }
-        if ($map['tag'] === ASN1::TYPE_ANY && isset($skeleton['tag'])) {
-            $map['tag'] = $skeleton['tag'];
+        if ($map[ 'tag' ] === ASN1::TYPE_ANY && isset($skeleton[ 'tag' ])) {
+            $map[ 'tag' ] = $skeleton[ 'tag' ];
         }
-        if (!in_array($map['tag'], [ASN1::TYPE_ANY, ASN1::TYPE_ANY_RAW, ASN1::TYPE_ANY_SKIP, ASN1::TYPE_ANY_DER]) &&
-            $map['tag'] !== $skeleton['tag']
+        if (!in_array($map[ 'tag' ], [ ASN1::TYPE_ANY, ASN1::TYPE_ANY_RAW, ASN1::TYPE_ANY_SKIP, ASN1::TYPE_ANY_DER ]) &&
+            $map[ 'tag' ] !== $skeleton[ 'tag' ]
         ) {
-            if (!isset($map['optional']) || !$map['optional']) {
-                throw new ASN1Exception('Decoded data does not match mapping - ' . $skeleton['tag']);
+            if (!isset($map[ 'optional' ]) || !$map[ 'optional' ]) {
+                throw new ASN1Exception('Decoded data does not match mapping - '.$skeleton[ 'tag' ]);
             }
             return null;
         } else {
-            switch ($map['tag']) {
+            switch ($map[ 'tag' ]) {
                 case ASN1::TYPE_ANY_DER:
-                    return $this->reader->chunk($skeleton['start'], $skeleton['length']);
+                    return $this->reader->chunk($skeleton[ 'start' ], $skeleton[ 'length' ]);
                 case ASN1::TYPE_ANY_SKIP:
                     return null;
                 case ASN1::TYPE_ANY_RAW:
-                    return $skeleton['value'] ?? null;
+                    return $skeleton[ 'value' ] ?? null;
                 case ASN1::TYPE_SET:
-                    if (isset($map['repeat'])) {
-                        $result = [];
-                        foreach ($skeleton['children'] as $v) {
-                            $result[] = $this->map($map['repeat'], $v);
+                    if (isset($map[ 'repeat' ])) {
+                        $result = [ ];
+                        foreach ($skeleton[ 'children' ] as $v) {
+                            $result[ ] = $this->map($map[ 'repeat' ], $v);
                         }
                         return $result;
                     } else {
-                        if (!isset($map['children'])) {
+                        if (!isset($map[ 'children' ])) {
                             return null;
                         }
-                        $temp = $skeleton['children'];
-                        $result = [];
+                        $temp = $skeleton[ 'children' ];
+                        $result = [ ];
                         // named first
-                        foreach ($map['children'] as $k => $v) {
-                            if (isset($v['name'])) {
-                                $result[$k] = null;
+                        foreach ($map[ 'children' ] as $k => $v) {
+                            if (isset($v[ 'name' ])) {
+                                $result[ $k ] = null;
                                 foreach ($temp as $kk => $vv) {
-                                    if ($vv['class'] !== ASN1::CLASS_UNIVERSAL && (int)$v['name'] === $vv['tag']) {
+                                    if ($vv[ 'class' ] !== ASN1::CLASS_UNIVERSAL && (int) $v[ 'name' ] === $vv[ 'tag' ]) {
                                         try {
-                                            if (isset($v['implicit']) && $v['implicit']) {
-                                                $vv['class'] = ASN1::CLASS_UNIVERSAL;
-                                                $vv['tag'] = $map['tag'];
+                                            if (isset($v[ 'implicit' ]) && $v[ 'implicit' ]) {
+                                                $vv[ 'class' ] = ASN1::CLASS_UNIVERSAL;
+                                                $vv[ 'tag' ] = $map[ 'tag' ];
                                             } else {
-                                                $vv = $vv['children'][0] ?? null;
+                                                $vv = $vv[ 'children' ][ 0 ] ?? null;
                                             }
-                                            $result[$k] = $this->map($v, $vv);
-                                            unset($temp[$kk]);
+                                            $result[ $k ] = $this->map($v, $vv);
+                                            unset($temp[ $kk ]);
                                             break;
                                         } catch (ASN1Exception $e) {
                                         }
                                     }
                                 }
-                                if ($result[$k] === null && (!isset($v['optional']) || !$v['optional'])) {
-                                    throw new ASN1Exception('Missing tagged type - ' . $k);
+                                if ($result[ $k ] === null && (!isset($v[ 'optional' ]) || !$v[ 'optional' ])) {
+                                    throw new ASN1Exception('Missing tagged type - '.$k);
                                 }
                             }
                         }
-                        foreach ($map['children'] as $k => $v) {
-                            if (isset($v['name'])) {
+                        foreach ($map[ 'children' ] as $k => $v) {
+                            if (isset($v[ 'name' ])) {
                                 continue;
                             }
-                            $result[$k] = null;
+                            $result[ $k ] = null;
                             foreach ($temp as $kk => $vv) {
-                                if ($v['tag'] === $vv['tag'] ||
+                                if ($v[ 'tag' ] === $vv[ 'tag' ] ||
                                     in_array(
-                                        $v['tag'],
+                                        $v[ 'tag' ],
                                         [ ASN1::TYPE_ANY, ASN1::TYPE_ANY_DER, ASN1::TYPE_ANY_RAW, ASN1::TYPE_ANY_SKIP, ASN1::TYPE_CHOICE ]
                                     )
                                 ) {
                                     try {
-                                        $result[$k] = $this->map($v, $vv);
-                                        unset($temp[$kk]);
+                                        $result[ $k ] = $this->map($v, $vv);
+                                        unset($temp[ $kk ]);
                                         break;
                                     } catch (ASN1Exception $e) {
-                                        $result[$k] = null;
+                                        $result[ $k ] = null;
                                     }
                                 }
                             }
-                            if ($result[$k] === null && (!isset($v['optional']) || !$v['optional'])) {
-                                throw new ASN1Exception('Decoded data does not match mapping - ' . $k);
+                            if ($result[ $k ] === null && (!isset($v[ 'optional' ]) || !$v[ 'optional' ])) {
+                                throw new ASN1Exception('Decoded data does not match mapping - '.$k);
                             }
                         }
                         return $result;
                     }
                     break;
                 case ASN1::TYPE_SEQUENCE:
-                    if (isset($map['repeat'])) {
-                        $result = [];
-                        foreach ($skeleton['children'] as $v) {
-                            $result[] = $this->map($map['repeat'], $v);
+                    if (isset($map[ 'repeat' ])) {
+                        $result = [ ];
+                        foreach ($skeleton[ 'children' ] as $v) {
+                            $result[ ] = $this->map($map[ 'repeat' ], $v);
                         }
                         return $result;
                     } else {
-                        if (!isset($map['children'])) {
+                        if (!isset($map[ 'children' ])) {
                             return null;
                         }
-                        $result = [];
-                        foreach ($skeleton['children'] as $vv) {
-                            foreach ($map['children'] as $k => $v) {
-                                if (isset($v['name']) && $vv['class'] !== ASN1::CLASS_UNIVERSAL && (int)$v['name'] === $vv['tag']) {
-                                    if (isset($v['implicit']) && $v['implicit']) {
-                                        $vv['class'] = ASN1::CLASS_UNIVERSAL;
-                                        $vv['tag'] = $map['tag'];
+                        $result = [ ];
+                        foreach ($skeleton[ 'children' ] as $vv) {
+                            foreach ($map[ 'children' ] as $k => $v) {
+                                if (isset($v[ 'name' ]) && $vv[ 'class' ] !== ASN1::CLASS_UNIVERSAL && (int) $v[ 'name' ] === $vv[ 'tag' ]) {
+                                    if (isset($v[ 'implicit' ]) && $v[ 'implicit' ]) {
+                                        $vv[ 'class' ] = ASN1::CLASS_UNIVERSAL;
+                                        $vv[ 'tag' ] = $map[ 'tag' ];
                                     } else {
-                                        $vv = $vv['children'][0] ?? null;
+                                        $vv = $vv[ 'children' ][ 0 ] ?? null;
                                     }
-                                    $result[$k] = $this->map($v, $vv);
-                                    unset($map['children'][$k]);
+                                    $result[ $k ] = $this->map($v, $vv);
+                                    unset($map[ 'children' ][ $k ]);
                                     break;
                                 }
-                                if (!isset($v['name']) &&
+                                if (!isset($v[ 'name' ]) &&
                                     (
-                                        $v['tag'] === $vv['tag'] ||
+                                        $v[ 'tag' ] === $vv[ 'tag' ] ||
                                         in_array(
-                                            $v['tag'],
+                                            $v[ 'tag' ],
                                             [ ASN1::TYPE_ANY, ASN1::TYPE_ANY_DER, ASN1::TYPE_ANY_RAW, ASN1::TYPE_ANY_SKIP, ASN1::TYPE_CHOICE ]
                                         )
                                     )
                                 ) {
                                     try {
                                         $temp = $this->map($v, $vv);
-                                        $result[$k] = $temp;
-                                        unset($map['children'][$k]);
+                                        $result[ $k ] = $temp;
+                                        unset($map[ 'children' ][ $k ]);
                                         break;
                                     } catch (ASN1Exception $e) {
                                     }
                                 }
-                                if (!isset($v['optional']) || !$v['optional']) {
-                                    throw new ASN1Exception('Missing type - ' . $k);
+                                if (!isset($v[ 'optional' ]) || !$v[ 'optional' ]) {
+                                    throw new ASN1Exception('Missing type - '.$k);
                                 } else {
-                                    $result[$k] = null;
-                                    unset($map['children'][$k]);
+                                    $result[ $k ] = null;
+                                    unset($map[ 'children' ][ $k ]);
                                 }
                             }
                         }
@@ -445,45 +444,45 @@ 
                     }
                     break;
                 case ASN1::TYPE_OBJECT_IDENTIFIER:
-                    return isset($map['resolve']) && $map['resolve'] ? ASN1::OIDtoText($skeleton['value']) : $skeleton['value'];
+                    return isset($map[ 'resolve' ]) && $map[ 'resolve' ] ? ASN1::OIDtoText($skeleton[ 'value' ]) : $skeleton[ 'value' ];
                 case ASN1::TYPE_OCTET_STRING:
-                    if (isset($map['der']) && $map['der']) {
-                        $temp = static::fromString($skeleton['value']);
-                        return isset($map['map']) ? $temp->map($map['map']) : $temp->values();
+                    if (isset($map[ 'der' ]) && $map[ 'der' ]) {
+                        $temp = static::fromString($skeleton[ 'value' ]);
+                        return isset($map[ 'map' ]) ? $temp->map($map[ 'map' ]) : $temp->values();
                     } else {
-                        return isset($map['raw']) && $map['raw'] ? $skeleton['value'] : base64_encode($skeleton['value']);
+                        return isset($map[ 'raw' ]) && $map[ 'raw' ] ? $skeleton[ 'value' ] : base64_encode($skeleton[ 'value' ]);
                     }
                     break;
                 case ASN1::TYPE_INTEGER:
-                    $base = isset($map['base']) && (int)$map['base'] ? (int)$map['base'] : 10;
+                    $base = isset($map[ 'base' ]) && (int) $map[ 'base' ] ? (int) $map[ 'base' ] : 10;
                     if ($base < 3) {
-                        $result = $skeleton['value'];
+                        $result = $skeleton[ 'value' ];
                     } else {
-                        if (strlen($skeleton['value']) > 53 && $base === 16) {
+                        if (strlen($skeleton[ 'value' ]) > 53 && $base === 16) {
                             $hex = '';
-                            for ($i = strlen($skeleton['value']) - 4; $i >= 0; $i-=4) {
-                                $hex .= dechex((int)bindec(substr($skeleton['value'], $i, 4)));
+                            for ($i = strlen($skeleton[ 'value' ]) - 4; $i >= 0; $i -= 4) {
+                                $hex .= dechex((int) bindec(substr($skeleton[ 'value' ], $i, 4)));
                             }
                             $result = strrev($hex);
                         } else {
-                            $temp = base_convert($skeleton['value'], 2, $base);
+                            $temp = base_convert($skeleton[ 'value' ], 2, $base);
                             if ($base === 10) {
-                                $temp = (int)$temp;
+                                $temp = (int) $temp;
                             }
                             $result = $temp;
                         }
                     }
-                    if (isset($map['map']) && isset($map['map'][$result])) {
-                        $result = $map['map'][$result];
+                    if (isset($map[ 'map' ]) && isset($map[ 'map' ][ $result ])) {
+                        $result = $map[ 'map' ][ $result ];
                     }
                     return $result;
                 case ASN1::TYPE_UTC_TIME:
                 case ASN1::TYPE_GENERALIZED_TIME:
-                    return $skeleton['value'];
+                    return $skeleton[ 'value' ];
                 default:
-                    $result = $skeleton['value'];
-                    if (isset($map['map']) && isset($map['map'][$result])) {
-                        $result = $map['map'][$result];
+                    $result = $skeleton[ 'value' ];
+                    if (isset($map[ 'map' ]) && isset($map[ 'map' ][ $result ])) {
+                        $result = $map[ 'map' ][ $result ];
                     }
                     return $result;
             }

src/Encoder.php

Spacing +44 added lines, -44 removed lines

@@ -18,18 +18,18 @@ 
      */
     public static function encode($source, $mapping)
     {
-        if (isset($mapping['default']) && $source === $mapping['default']) {
+        if (isset($mapping[ 'default' ]) && $source === $mapping[ 'default' ]) {
             return '';
         }
 
-        $tag = $mapping['tag'];
+        $tag = $mapping[ 'tag' ];
         switch ($tag) {
             case ASN1::TYPE_SET:
             case ASN1::TYPE_SEQUENCE:
                 $tag |= 0x20; // set the constructed bit
                 $value = '';
-                if (isset($mapping['min']) && isset($mapping['max'])) {
-                    $child = $mapping['children'];
+                if (isset($mapping[ 'min' ]) && isset($mapping[ 'max' ])) {
+                    $child = $mapping[ 'children' ];
                     foreach ($source as $content) {
                         $temp = static::encode($content, $child);
                         if ($temp === false) {
@@ -39,23 +39,23 @@ 
                     }
                     break;
                 }
-                if (isset($mapping['repeat'])) {
+                if (isset($mapping[ 'repeat' ])) {
                     foreach ($source as $content) {
-                        $temp = static::encode($content, $mapping['repeat']);
+                        $temp = static::encode($content, $mapping[ 'repeat' ]);
                         if ($temp === false) {
                             return false;
                         }
                         $value .= $temp;
                     }
                 } else {
-                    foreach ($mapping['children'] as $key => $child) {
+                    foreach ($mapping[ 'children' ] as $key => $child) {
                         if (!array_key_exists($key, $source)) {
-                            if (!isset($child['optional'])) {
+                            if (!isset($child[ 'optional' ])) {
                                 return false;
                             }
                             continue;
                         }
-                        $temp = static::encode($source[$key], $child);
+                        $temp = static::encode($source[ $key ], $child);
                         if ($temp === false) {
                             return false;
                         }
@@ -68,11 +68,11 @@ 
                 break;
             case ASN1::TYPE_CHOICE:
                 $temp = false;
-                foreach ($mapping['children'] as $key => $child) {
-                    if (!isset($source[$key])) {
+                foreach ($mapping[ 'children' ] as $key => $child) {
+                    if (!isset($source[ $key ])) {
                         continue;
                     }
-                    $temp = static::encode($source[$key], $child);
+                    $temp = static::encode($source[ $key ], $child);
                     if ($temp === false) {
                         return false;
                     }
@@ -83,17 +83,17 @@ 
                 return $temp;
             case ASN1::TYPE_INTEGER:
             case ASN1::TYPE_ENUMERATED:
-                if (!isset($mapping['mapping']) && isset($mapping['base']) && $mapping['base'] === 16) {
+                if (!isset($mapping[ 'mapping' ]) && isset($mapping[ 'base' ]) && $mapping[ 'base' ] === 16) {
                     $value = hex2bin($source);
                 } else {
-                    if (!isset($mapping['mapping'])) {
-                        $value = ASN1::toBase256($source, isset($mapping['base']) ? $mapping['base'] : 10);
+                    if (!isset($mapping[ 'mapping' ])) {
+                        $value = ASN1::toBase256($source, isset($mapping[ 'base' ]) ? $mapping[ 'base' ] : 10);
                     } else {
-                        $value = array_search($source, $mapping['mapping']);
+                        $value = array_search($source, $mapping[ 'mapping' ]);
                         if ($value === false) {
                             return false;
                         }
-                        $value = ASN1::toBase256($value, isset($mapping['base']) ? (int)$mapping['base'] : 10);
+                        $value = ASN1::toBase256($value, isset($mapping[ 'base' ]) ? (int) $mapping[ 'base' ] : 10);
                     }
                 }
                 if (!strlen($value)) {
@@ -102,24 +102,24 @@ 
                 break;
             case ASN1::TYPE_UTC_TIME:
             case ASN1::TYPE_GENERALIZED_TIME:
-                $format = $mapping['tag'] == ASN1::TYPE_UTC_TIME ? 'y' : 'Y';
-                $format.= 'mdHis';
-                $value = @gmdate($format, strtotime($source)) . 'Z';
+                $format = $mapping[ 'tag' ] == ASN1::TYPE_UTC_TIME ? 'y' : 'Y';
+                $format .= 'mdHis';
+                $value = @gmdate($format, strtotime($source)).'Z';
                 break;
             case ASN1::TYPE_BIT_STRING:
-                if (isset($mapping['mapping'])) {
-                    $mcnt = count($mapping['mapping']);
+                if (isset($mapping[ 'mapping' ])) {
+                    $mcnt = count($mapping[ 'mapping' ]);
                     $bits = array_fill(0, $mcnt, 0);
                     $size = 0;
                     for ($i = 0; $i < $mcnt; $i++) {
-                        if (in_array($mapping['mapping'][$i], $source)) {
-                            $bits[$i] = 1;
+                        if (in_array($mapping[ 'mapping' ][ $i ], $source)) {
+                            $bits[ $i ] = 1;
                             $size = $i;
                         }
                     }
 
-                    if (isset($mapping['min']) && $mapping['min'] >= 1 && $size < $mapping['min']) {
-                        $size = $mapping['min'] - 1;
+                    if (isset($mapping[ 'min' ]) && $mapping[ 'min' ] >= 1 && $size < $mapping[ 'min' ]) {
+                        $size = $mapping[ 'min' ] - 1;
                     }
 
                     $offset = 8 - (($size + 1) & 7);
@@ -128,23 +128,23 @@ 
                     $value = chr($offset);
 
                     for ($i = $size + 1; $i < $mcnt; $i++) {
-                        unset($bits[$i]);
+                        unset($bits[ $i ]);
                     }
 
                     $bits = implode('', array_pad($bits, $size + $offset + 1, 0));
                     $bytes = explode(' ', rtrim(chunk_split($bits, 8, ' ')));
                     foreach ($bytes as $byte) {
-                        $value.= chr((int)bindec($byte));
+                        $value .= chr((int) bindec($byte));
                     }
 
                     break;
                 }
                 // default to octet string if no mapping is present
             case ASN1::TYPE_OCTET_STRING:
-                $value = isset($mapping['raw']) && $mapping['raw'] ? $source : base64_decode($source);
+                $value = isset($mapping[ 'raw' ]) && $mapping[ 'raw' ] ? $source : base64_decode($source);
                 break;
             case ASN1::TYPE_OBJECT_IDENTIFIER:
-                if (!isset($source) && $mapping['optional']) {
+                if (!isset($source) && $mapping[ 'optional' ]) {
                     return;
                 }
                 $oid = preg_match('(^(\d+\.?)+$)', $source) ? $source : ASN1::TextToOID($source);
@@ -152,20 +152,20 @@ 
                     throw new ASN1Exception('Invalid OID');
                 }
                 $parts = explode('.', $oid);
-                $value = chr(40 * $parts[0] + $parts[1]);
+                $value = chr(40 * $parts[ 0 ] + $parts[ 1 ]);
                 $pcnt = count($parts);
                 for ($i = 2; $i < $pcnt; $i++) {
                     $temp = '';
-                    if (!$parts[$i]) {
+                    if (!$parts[ $i ]) {
                         $temp = "\0";
                     } else {
-                        while ($parts[$i]) {
-                            $temp = chr(0x80 | ($parts[$i] & 0x7F)) . $temp;
-                            $parts[$i] >>= 7;
+                        while ($parts[ $i ]) {
+                            $temp = chr(0x80 | ($parts[ $i ] & 0x7F)).$temp;
+                            $parts[ $i ] >>= 7;
                         }
-                        $temp[strlen($temp) - 1] = $temp[strlen($temp) - 1] & chr(0x7F);
+                        $temp[ strlen($temp) - 1 ] = $temp[ strlen($temp) - 1 ] & chr(0x7F);
                     }
-                    $value.= $temp;
+                    $value .= $temp;
                 }
                 break;
             case ASN1::TYPE_ANY:
@@ -206,16 +206,16 @@ 
         }
 
         $length = static::length(strlen($value));
-        if (isset($mapping['name'])) {
-            if (isset($mapping['implicit']) && $mapping['implicit']) {
-                $tag = ((ASN1::CLASS_CONTEXT_SPECIFIC ?? 2) << 6) | (ord($value[0]) & 0x20) | $mapping['name'];
-                return chr($tag) . $length . $value;
+        if (isset($mapping[ 'name' ])) {
+            if (isset($mapping[ 'implicit' ]) && $mapping[ 'implicit' ]) {
+                $tag = ((ASN1::CLASS_CONTEXT_SPECIFIC ?? 2) << 6) | (ord($value[ 0 ]) & 0x20) | $mapping[ 'name' ];
+                return chr($tag).$length.$value;
             } else {
-                $value = chr($tag) . $length . $value;
-                return chr(((ASN1::CLASS_CONTEXT_SPECIFIC ?? 2) << 6) | 0x20 | $mapping['name']) . static::length(strlen($value)) . $value;
+                $value = chr($tag).$length.$value;
+                return chr(((ASN1::CLASS_CONTEXT_SPECIFIC ?? 2) << 6) | 0x20 | $mapping[ 'name' ]).static::length(strlen($value)).$value;
             }
         }
-        return chr($tag) . $length . $value;
+        return chr($tag).$length.$value;
     }
 
     protected static function length($length)

src/ASN1.php

Spacing +4 added lines, -4 removed lines

@@ -52,10 +52,10 @@ 
     {
         $bin = base_convert($number, $base, 2);
         $res = "";
-        $len = (int)ceil(strlen($bin) / 8) * 8;
+        $len = (int) ceil(strlen($bin) / 8) * 8;
         $bin = str_pad($bin, $len, "0", STR_PAD_LEFT);
-        for ($i = ($len-8); $i >= 0; $i -= 8) {
-            $res = chr(base_convert(substr($bin, $i, 8), 2, 10)) . $res;
+        for ($i = ($len - 8); $i >= 0; $i -= 8) {
+            $res = chr(base_convert(substr($bin, $i, 8), 2, 10)).$res;
         }
         return $res;
     }
@@ -311,6 +311,6 @@ 
     }
     public static function TextToOID($text)
     {
-        return static::$oids[$text] ?? $text;
+        return static::$oids[ $text ] ?? $text;
     }
 }