@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function getStats(): DriverStatistic |
60 | 60 | { |
61 | - $stats = (array)zend_shm_cache_info(); |
|
61 | + $stats = (array) zend_shm_cache_info(); |
|
62 | 62 | return (new DriverStatistic()) |
63 | 63 | ->setData(implode(', ', array_keys($this->itemInstances))) |
64 | 64 | ->setInfo(sprintf("The Zend memory have %d item(s) in cache.\n For more information see RawData.", $stats['items_total'])) |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * Check for Cross-Driver type confusion |
125 | 125 | */ |
126 | 126 | if ($item instanceof Item) { |
127 | - return (bool)zend_shm_cache_delete($item->getKey()); |
|
127 | + return (bool) zend_shm_cache_delete($item->getKey()); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected'); |
@@ -31,110 +31,110 @@ |
||
31 | 31 | */ |
32 | 32 | class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterface |
33 | 33 | { |
34 | - use DriverBaseTrait; |
|
35 | - |
|
36 | - /** |
|
37 | - * @return bool |
|
38 | - */ |
|
39 | - public function driverCheck(): bool |
|
40 | - { |
|
41 | - return extension_loaded('Zend Data Cache') && function_exists('zend_shm_cache_store'); |
|
42 | - } |
|
43 | - |
|
44 | - /** |
|
45 | - * @return string |
|
46 | - */ |
|
47 | - public function getHelp(): string |
|
48 | - { |
|
49 | - return <<<HELP |
|
34 | + use DriverBaseTrait; |
|
35 | + |
|
36 | + /** |
|
37 | + * @return bool |
|
38 | + */ |
|
39 | + public function driverCheck(): bool |
|
40 | + { |
|
41 | + return extension_loaded('Zend Data Cache') && function_exists('zend_shm_cache_store'); |
|
42 | + } |
|
43 | + |
|
44 | + /** |
|
45 | + * @return string |
|
46 | + */ |
|
47 | + public function getHelp(): string |
|
48 | + { |
|
49 | + return <<<HELP |
|
50 | 50 | <p> |
51 | 51 | This driver rely on Zend Server 8.5+, see: https://www.zend.com/en/products/zend_server |
52 | 52 | </p> |
53 | 53 | HELP; |
54 | - } |
|
55 | - |
|
56 | - /** |
|
57 | - * @return DriverStatistic |
|
58 | - */ |
|
59 | - public function getStats(): DriverStatistic |
|
60 | - { |
|
61 | - $stats = (array)zend_shm_cache_info(); |
|
62 | - return (new DriverStatistic()) |
|
63 | - ->setData(implode(', ', array_keys($this->itemInstances))) |
|
64 | - ->setInfo(sprintf("The Zend memory have %d item(s) in cache.\n For more information see RawData.", $stats['items_total'])) |
|
65 | - ->setRawData($stats) |
|
66 | - ->setSize($stats['memory_total']); |
|
67 | - } |
|
68 | - |
|
69 | - /** |
|
70 | - * @return bool |
|
71 | - */ |
|
72 | - protected function driverConnect(): bool |
|
73 | - { |
|
74 | - return true; |
|
75 | - } |
|
76 | - |
|
77 | - /** |
|
78 | - * @param CacheItemInterface $item |
|
79 | - * @return null|array |
|
80 | - */ |
|
81 | - protected function driverRead(CacheItemInterface $item) |
|
82 | - { |
|
83 | - $data = zend_shm_cache_fetch($item->getKey()); |
|
84 | - if ($data === false) { |
|
85 | - return null; |
|
86 | - } |
|
87 | - |
|
88 | - return $data; |
|
89 | - } |
|
90 | - |
|
91 | - /** |
|
92 | - * @param CacheItemInterface $item |
|
93 | - * @return mixed |
|
94 | - * @throws PhpfastcacheInvalidArgumentException |
|
95 | - */ |
|
96 | - protected function driverWrite(CacheItemInterface $item): bool |
|
97 | - { |
|
98 | - /** |
|
99 | - * Check for Cross-Driver type confusion |
|
100 | - */ |
|
101 | - if ($item instanceof Item) { |
|
102 | - $ttl = $item->getExpirationDate()->getTimestamp() - time(); |
|
103 | - |
|
104 | - return zend_shm_cache_store($item->getKey(), $this->driverPreWrap($item), ($ttl > 0 ? $ttl : 0)); |
|
105 | - } |
|
106 | - |
|
107 | - throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected'); |
|
108 | - } |
|
109 | - |
|
110 | - /******************** |
|
54 | + } |
|
55 | + |
|
56 | + /** |
|
57 | + * @return DriverStatistic |
|
58 | + */ |
|
59 | + public function getStats(): DriverStatistic |
|
60 | + { |
|
61 | + $stats = (array)zend_shm_cache_info(); |
|
62 | + return (new DriverStatistic()) |
|
63 | + ->setData(implode(', ', array_keys($this->itemInstances))) |
|
64 | + ->setInfo(sprintf("The Zend memory have %d item(s) in cache.\n For more information see RawData.", $stats['items_total'])) |
|
65 | + ->setRawData($stats) |
|
66 | + ->setSize($stats['memory_total']); |
|
67 | + } |
|
68 | + |
|
69 | + /** |
|
70 | + * @return bool |
|
71 | + */ |
|
72 | + protected function driverConnect(): bool |
|
73 | + { |
|
74 | + return true; |
|
75 | + } |
|
76 | + |
|
77 | + /** |
|
78 | + * @param CacheItemInterface $item |
|
79 | + * @return null|array |
|
80 | + */ |
|
81 | + protected function driverRead(CacheItemInterface $item) |
|
82 | + { |
|
83 | + $data = zend_shm_cache_fetch($item->getKey()); |
|
84 | + if ($data === false) { |
|
85 | + return null; |
|
86 | + } |
|
87 | + |
|
88 | + return $data; |
|
89 | + } |
|
90 | + |
|
91 | + /** |
|
92 | + * @param CacheItemInterface $item |
|
93 | + * @return mixed |
|
94 | + * @throws PhpfastcacheInvalidArgumentException |
|
95 | + */ |
|
96 | + protected function driverWrite(CacheItemInterface $item): bool |
|
97 | + { |
|
98 | + /** |
|
99 | + * Check for Cross-Driver type confusion |
|
100 | + */ |
|
101 | + if ($item instanceof Item) { |
|
102 | + $ttl = $item->getExpirationDate()->getTimestamp() - time(); |
|
103 | + |
|
104 | + return zend_shm_cache_store($item->getKey(), $this->driverPreWrap($item), ($ttl > 0 ? $ttl : 0)); |
|
105 | + } |
|
106 | + |
|
107 | + throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected'); |
|
108 | + } |
|
109 | + |
|
110 | + /******************** |
|
111 | 111 | * |
112 | 112 | * PSR-6 Extended Methods |
113 | 113 | * |
114 | 114 | *******************/ |
115 | 115 | |
116 | - /** |
|
117 | - * @param CacheItemInterface $item |
|
118 | - * @return bool |
|
119 | - * @throws PhpfastcacheInvalidArgumentException |
|
120 | - */ |
|
121 | - protected function driverDelete(CacheItemInterface $item): bool |
|
122 | - { |
|
123 | - /** |
|
124 | - * Check for Cross-Driver type confusion |
|
125 | - */ |
|
126 | - if ($item instanceof Item) { |
|
127 | - return (bool)zend_shm_cache_delete($item->getKey()); |
|
128 | - } |
|
129 | - |
|
130 | - throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected'); |
|
131 | - } |
|
132 | - |
|
133 | - /** |
|
134 | - * @return bool |
|
135 | - */ |
|
136 | - protected function driverClear(): bool |
|
137 | - { |
|
138 | - return @zend_shm_cache_clear(); |
|
139 | - } |
|
116 | + /** |
|
117 | + * @param CacheItemInterface $item |
|
118 | + * @return bool |
|
119 | + * @throws PhpfastcacheInvalidArgumentException |
|
120 | + */ |
|
121 | + protected function driverDelete(CacheItemInterface $item): bool |
|
122 | + { |
|
123 | + /** |
|
124 | + * Check for Cross-Driver type confusion |
|
125 | + */ |
|
126 | + if ($item instanceof Item) { |
|
127 | + return (bool)zend_shm_cache_delete($item->getKey()); |
|
128 | + } |
|
129 | + |
|
130 | + throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected'); |
|
131 | + } |
|
132 | + |
|
133 | + /** |
|
134 | + * @return bool |
|
135 | + */ |
|
136 | + protected function driverClear(): bool |
|
137 | + { |
|
138 | + return @zend_shm_cache_clear(); |
|
139 | + } |
|
140 | 140 | } |
@@ -78,8 +78,7 @@ |
||
78 | 78 | * @param CacheItemInterface $item |
79 | 79 | * @return null|array |
80 | 80 | */ |
81 | - protected function driverRead(CacheItemInterface $item) |
|
82 | - { |
|
81 | + protected function driverRead(CacheItemInterface $item) { |
|
83 | 82 | $data = zend_shm_cache_fetch($item->getKey()); |
84 | 83 | if ($data === false) { |
85 | 84 | return null; |
@@ -95,7 +95,7 @@ |
||
95 | 95 | 'notifier' => [ |
96 | 96 | 'info' => [ |
97 | 97 | 'files' => [ |
98 | - 'value' => "dropdown", // static notifier |
|
98 | + 'value' => "dropdown", // static notifier |
|
99 | 99 | ], |
100 | 100 | ], |
101 | 101 | ], |
@@ -45,37 +45,37 @@ |
||
45 | 45 | |
46 | 46 | case 'server.index.load.custom': |
47 | 47 | switch ($data['name']) { |
48 | - case 'files_get_recipients': |
|
49 | - RecipientHandler::doGetRecipients(); |
|
50 | - break; |
|
48 | + case 'files_get_recipients': |
|
49 | + RecipientHandler::doGetRecipients(); |
|
50 | + break; |
|
51 | 51 | |
52 | - case 'download_file': |
|
53 | - DownloadHandler::doDownload(); |
|
54 | - break; |
|
52 | + case 'download_file': |
|
53 | + DownloadHandler::doDownload(); |
|
54 | + break; |
|
55 | 55 | |
56 | - case 'upload_file': |
|
57 | - UploadHandler::doUpload(); |
|
58 | - break; |
|
56 | + case 'upload_file': |
|
57 | + UploadHandler::doUpload(); |
|
58 | + break; |
|
59 | 59 | |
60 | - case 'form': |
|
61 | - if (isset($_GET['backend'])) { |
|
62 | - $backend = urldecode($_GET["backend"]); |
|
63 | - } |
|
64 | - else { |
|
65 | - $backend = ''; |
|
66 | - } |
|
67 | - $backendstore = Files\Backend\BackendStore::getInstance(); |
|
60 | + case 'form': |
|
61 | + if (isset($_GET['backend'])) { |
|
62 | + $backend = urldecode($_GET["backend"]); |
|
63 | + } |
|
64 | + else { |
|
65 | + $backend = ''; |
|
66 | + } |
|
67 | + $backendstore = Files\Backend\BackendStore::getInstance(); |
|
68 | 68 | |
69 | - if ($backendstore->backendExists($backend)) { |
|
70 | - $backendInstance = $backendstore->getInstanceOfBackend($backend); |
|
71 | - $formdata = $backendInstance->getFormConfig(); |
|
69 | + if ($backendstore->backendExists($backend)) { |
|
70 | + $backendInstance = $backendstore->getInstanceOfBackend($backend); |
|
71 | + $formdata = $backendInstance->getFormConfig(); |
|
72 | 72 | |
73 | - exit($formdata); |
|
74 | - } |
|
73 | + exit($formdata); |
|
74 | + } |
|
75 | 75 | |
76 | - exit("Specified backend does not exist!"); |
|
76 | + exit("Specified backend does not exist!"); |
|
77 | 77 | |
78 | - break; |
|
78 | + break; |
|
79 | 79 | } |
80 | 80 | break; |
81 | 81 | } |
@@ -132,7 +132,7 @@ |
||
132 | 132 | throw new PhpfastcacheInvalidConfigurationException('Path must be a valid string in "$server" configuration array if host is not defined'); |
133 | 133 | } |
134 | 134 | |
135 | - if (!empty($server['host']) && (empty($server['port']) || !is_int($server['port'])|| $server['port'] < 1)) { |
|
135 | + if (!empty($server['host']) && (empty($server['port']) || !is_int($server['port']) || $server['port'] < 1)) { |
|
136 | 136 | throw new PhpfastcacheInvalidConfigurationException('Port must be a valid integer in "$server" configuration array'); |
137 | 137 | } |
138 | 138 |
@@ -23,113 +23,113 @@ |
||
23 | 23 | |
24 | 24 | class Config extends ConfigurationOption |
25 | 25 | { |
26 | - /** |
|
27 | - * @var array |
|
28 | - * |
|
29 | - * Multiple server can be added this way: |
|
30 | - * $cfg->setServers([ |
|
31 | - * [ |
|
32 | - * // If you use an UNIX socket set the host and port to null |
|
33 | - * 'host' => '127.0.0.1', |
|
34 | - * //'path' => 'path/to/unix/socket', |
|
35 | - * 'port' => 11211, |
|
36 | - * ] |
|
37 | - * ]); |
|
38 | - */ |
|
39 | - protected $servers = []; |
|
40 | - |
|
41 | - /** |
|
42 | - * @var string |
|
43 | - */ |
|
44 | - protected $host = '127.0.0.1'; |
|
45 | - |
|
46 | - /** |
|
47 | - * @var int |
|
48 | - */ |
|
49 | - protected $port = 11211; |
|
50 | - |
|
51 | - /** |
|
52 | - * @return array |
|
53 | - */ |
|
54 | - public function getServers(): array |
|
55 | - { |
|
56 | - return $this->servers; |
|
57 | - } |
|
58 | - |
|
59 | - /** |
|
60 | - * @param array $servers |
|
61 | - * @return self |
|
62 | - * @throws PhpfastcacheInvalidConfigurationException |
|
63 | - */ |
|
64 | - public function setServers(array $servers): self |
|
65 | - { |
|
66 | - foreach ($servers as $server) { |
|
67 | - if (\array_key_exists('saslUser', $server) || array_key_exists('saslPassword', $server)) { |
|
68 | - throw new PhpfastcacheInvalidConfigurationException('Unlike Memcached, Memcache does not support SASL authentication'); |
|
69 | - } |
|
70 | - |
|
71 | - if ($diff = array_diff(array_keys($server), ['host', 'port', 'path'])) { |
|
72 | - throw new PhpfastcacheInvalidConfigurationException('Unknown keys for memcached server: ' . implode(', ', $diff)); |
|
73 | - } |
|
74 | - |
|
75 | - if (!empty($server['host']) && !empty($server['path'])) { |
|
76 | - throw new PhpfastcacheInvalidConfigurationException('Host and path cannot be simultaneous defined.'); |
|
77 | - } |
|
78 | - |
|
79 | - if ((isset($server['host']) && !is_string($server['host'])) || (empty($server['path']) && empty($server['host']))) { |
|
80 | - throw new PhpfastcacheInvalidConfigurationException('Host must be a valid string in "$server" configuration array if path is not defined'); |
|
81 | - } |
|
82 | - |
|
83 | - if ((isset($server['path']) && !is_string($server['path'])) || (empty($server['host']) && empty($server['path']))) { |
|
84 | - throw new PhpfastcacheInvalidConfigurationException('Path must be a valid string in "$server" configuration array if host is not defined'); |
|
85 | - } |
|
86 | - |
|
87 | - if (!empty($server['host']) && (empty($server['port']) || !is_int($server['port'])|| $server['port'] < 1)) { |
|
88 | - throw new PhpfastcacheInvalidConfigurationException('Port must be a valid integer in "$server" configuration array'); |
|
89 | - } |
|
90 | - |
|
91 | - if (!empty($server['port']) && !empty($server['path'])) { |
|
92 | - throw new PhpfastcacheInvalidConfigurationException('Port should not be defined along with path'); |
|
93 | - } |
|
94 | - } |
|
95 | - $this->servers = $servers; |
|
96 | - return $this; |
|
97 | - } |
|
98 | - |
|
99 | - /** |
|
100 | - * @return string |
|
101 | - */ |
|
102 | - public function getHost(): string |
|
103 | - { |
|
104 | - return $this->host; |
|
105 | - } |
|
106 | - |
|
107 | - /** |
|
108 | - * @param string $host |
|
109 | - * @return self |
|
110 | - */ |
|
111 | - public function setHost(string $host): self |
|
112 | - { |
|
113 | - $this->host = $host; |
|
114 | - |
|
115 | - return $this; |
|
116 | - } |
|
117 | - |
|
118 | - /** |
|
119 | - * @return int |
|
120 | - */ |
|
121 | - public function getPort(): int |
|
122 | - { |
|
123 | - return $this->port; |
|
124 | - } |
|
125 | - |
|
126 | - /** |
|
127 | - * @param int $port |
|
128 | - * @return self |
|
129 | - */ |
|
130 | - public function setPort(int $port): self |
|
131 | - { |
|
132 | - $this->port = $port; |
|
133 | - return $this; |
|
134 | - } |
|
26 | + /** |
|
27 | + * @var array |
|
28 | + * |
|
29 | + * Multiple server can be added this way: |
|
30 | + * $cfg->setServers([ |
|
31 | + * [ |
|
32 | + * // If you use an UNIX socket set the host and port to null |
|
33 | + * 'host' => '127.0.0.1', |
|
34 | + * //'path' => 'path/to/unix/socket', |
|
35 | + * 'port' => 11211, |
|
36 | + * ] |
|
37 | + * ]); |
|
38 | + */ |
|
39 | + protected $servers = []; |
|
40 | + |
|
41 | + /** |
|
42 | + * @var string |
|
43 | + */ |
|
44 | + protected $host = '127.0.0.1'; |
|
45 | + |
|
46 | + /** |
|
47 | + * @var int |
|
48 | + */ |
|
49 | + protected $port = 11211; |
|
50 | + |
|
51 | + /** |
|
52 | + * @return array |
|
53 | + */ |
|
54 | + public function getServers(): array |
|
55 | + { |
|
56 | + return $this->servers; |
|
57 | + } |
|
58 | + |
|
59 | + /** |
|
60 | + * @param array $servers |
|
61 | + * @return self |
|
62 | + * @throws PhpfastcacheInvalidConfigurationException |
|
63 | + */ |
|
64 | + public function setServers(array $servers): self |
|
65 | + { |
|
66 | + foreach ($servers as $server) { |
|
67 | + if (\array_key_exists('saslUser', $server) || array_key_exists('saslPassword', $server)) { |
|
68 | + throw new PhpfastcacheInvalidConfigurationException('Unlike Memcached, Memcache does not support SASL authentication'); |
|
69 | + } |
|
70 | + |
|
71 | + if ($diff = array_diff(array_keys($server), ['host', 'port', 'path'])) { |
|
72 | + throw new PhpfastcacheInvalidConfigurationException('Unknown keys for memcached server: ' . implode(', ', $diff)); |
|
73 | + } |
|
74 | + |
|
75 | + if (!empty($server['host']) && !empty($server['path'])) { |
|
76 | + throw new PhpfastcacheInvalidConfigurationException('Host and path cannot be simultaneous defined.'); |
|
77 | + } |
|
78 | + |
|
79 | + if ((isset($server['host']) && !is_string($server['host'])) || (empty($server['path']) && empty($server['host']))) { |
|
80 | + throw new PhpfastcacheInvalidConfigurationException('Host must be a valid string in "$server" configuration array if path is not defined'); |
|
81 | + } |
|
82 | + |
|
83 | + if ((isset($server['path']) && !is_string($server['path'])) || (empty($server['host']) && empty($server['path']))) { |
|
84 | + throw new PhpfastcacheInvalidConfigurationException('Path must be a valid string in "$server" configuration array if host is not defined'); |
|
85 | + } |
|
86 | + |
|
87 | + if (!empty($server['host']) && (empty($server['port']) || !is_int($server['port'])|| $server['port'] < 1)) { |
|
88 | + throw new PhpfastcacheInvalidConfigurationException('Port must be a valid integer in "$server" configuration array'); |
|
89 | + } |
|
90 | + |
|
91 | + if (!empty($server['port']) && !empty($server['path'])) { |
|
92 | + throw new PhpfastcacheInvalidConfigurationException('Port should not be defined along with path'); |
|
93 | + } |
|
94 | + } |
|
95 | + $this->servers = $servers; |
|
96 | + return $this; |
|
97 | + } |
|
98 | + |
|
99 | + /** |
|
100 | + * @return string |
|
101 | + */ |
|
102 | + public function getHost(): string |
|
103 | + { |
|
104 | + return $this->host; |
|
105 | + } |
|
106 | + |
|
107 | + /** |
|
108 | + * @param string $host |
|
109 | + * @return self |
|
110 | + */ |
|
111 | + public function setHost(string $host): self |
|
112 | + { |
|
113 | + $this->host = $host; |
|
114 | + |
|
115 | + return $this; |
|
116 | + } |
|
117 | + |
|
118 | + /** |
|
119 | + * @return int |
|
120 | + */ |
|
121 | + public function getPort(): int |
|
122 | + { |
|
123 | + return $this->port; |
|
124 | + } |
|
125 | + |
|
126 | + /** |
|
127 | + * @param int $port |
|
128 | + * @return self |
|
129 | + */ |
|
130 | + public function setPort(int $port): self |
|
131 | + { |
|
132 | + $this->port = $port; |
|
133 | + return $this; |
|
134 | + } |
|
135 | 135 | } |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | * Search the backend folder for backends and register them. |
61 | 61 | */ |
62 | 62 | public function initialize() { |
63 | - $list = []; // this hold our plugin folders |
|
63 | + $list = []; // this hold our plugin folders |
|
64 | 64 | $workdir = __DIR__ . self::BACKEND_DIR; |
65 | 65 | |
66 | 66 | // Populate the list of directories to check against |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * Search the backend folder for external backends and register them. |
88 | 88 | */ |
89 | 89 | public function initializeExternal() { |
90 | - $list = []; // this hold our plugin folders |
|
90 | + $list = []; // this hold our plugin folders |
|
91 | 91 | $workdir = $this->EXTERNAL_BACKEND_DIR; |
92 | 92 | |
93 | 93 | // Populate the list of directories to check against |
@@ -191,7 +191,7 @@ |
||
191 | 191 | "fields" => $this->formFields, |
192 | 192 | "formConfig" => $this->formConfig, |
193 | 193 | ], |
194 | - "data" => [ // here we can specify the default values. |
|
194 | + "data" => [// here we can specify the default values. |
|
195 | 195 | "server_address" => "files.demo.com", |
196 | 196 | "server_port" => "80", |
197 | 197 | "server_path" => "/remote.php/webdav", |
@@ -136,7 +136,7 @@ |
||
136 | 136 | "fields" => $this->formFields, |
137 | 137 | "formConfig" => $this->formConfig, |
138 | 138 | ], |
139 | - "data" => [ // here we can specify the default values. |
|
139 | + "data" => [// here we can specify the default values. |
|
140 | 140 | "server_address" => $_SERVER['HTTP_HOST'], |
141 | 141 | "server_ssl" => true, |
142 | 142 | "server_port" => "443", |
@@ -445,7 +445,7 @@ |
||
445 | 445 | |
446 | 446 | public static function my_rsa_sha_encode($data, $key_id, $signagure_alg) { |
447 | 447 | $algos = [ |
448 | - 'sha1WithRSAEncryption' => ['alg' => 'sha1', 'oid' => '1.3.14.3.2.26'], |
|
448 | + 'sha1WithRSAEncryption' => ['alg' => 'sha1', 'oid' => '1.3.14.3.2.26'], |
|
449 | 449 | 'sha256WithRSAEncryption' => ['alg' => 'sha256', 'oid' => '2.16.840.1.101.3.4.2.1'], |
450 | 450 | 'sha384WithRSAEncryption' => ['alg' => 'sha384', 'oid' => '2.16.840.1.101.3.4.2.2'], |
451 | 451 | 'sha512WithRSAEncryption' => ['alg' => 'sha512', 'oid' => '2.16.840.1.101.3.4.2.3'], |
@@ -212,7 +212,7 @@ |
||
212 | 212 | } |
213 | 213 | |
214 | 214 | protected function name($tag = null) { |
215 | - $this->beginsequence($tag); # seq of RDN |
|
215 | + $this->beginsequence($tag); # seq of RDN |
|
216 | 216 | $res = []; |
217 | 217 | while ($this->in()) { |
218 | 218 | $parts = []; |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | if (strcspn($attvalue, "\t\r\n\0 ") !== strlen($attvalue)) { |
56 | 56 | $attvalue = str_replace( |
57 | 57 | ["\t", "\r", "\n", "\0", " "], |
58 | - ['', '', '', '', ''], |
|
58 | + ['', '', '', '', ''], |
|
59 | 59 | $attvalue |
60 | 60 | ); |
61 | 61 | } |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | "\xE2\x81\xBF", /* Shift JIS FULLWIDTH SUPERSCRIPT N */ |
123 | 123 | "\xCA\x9F", /* L UNICODE IPA Extension */ |
124 | 124 | "\xCA\x80", /* R UNICODE IPA Extension */ |
125 | - "\xC9\xB4", ], /* N UNICODE IPA Extension */ |
|
125 | + "\xC9\xB4", ], /* N UNICODE IPA Extension */ |
|
126 | 126 | ['l', 'l', 'r', 'r', 'n', 'n', |
127 | 127 | 'E', 'E', 'e', 'e', 'X', 'X', 'x', 'x', 'P', 'P', 'p', 'p', 'R', 'R', 'r', 'r', 'S', 'S', 's', 's', 'I', 'I', |
128 | 128 | 'i', 'i', 'O', 'O', 'o', 'o', 'N', 'N', 'n', 'n', 'L', 'L', 'l', 'l', 'U', 'U', 'u', 'u', 'n', 'n', |
@@ -756,7 +756,7 @@ discard block |
||
756 | 756 | $sToken = ''; |
757 | 757 | $bSucces = false; |
758 | 758 | $bEndTag = false; |
759 | - for ($i = $pos,$iCount = strlen($body); $i < $iCount; ++$i) { |
|
759 | + for ($i = $pos, $iCount = strlen($body); $i < $iCount; ++$i) { |
|
760 | 760 | $char = $body[$i]; |
761 | 761 | |
762 | 762 | switch ($char) { |