comparison vendor/zendframework/zend-feed/src/Uri.php @ 12:7a779792577d

Update Drupal core to v8.4.5 (via Composer)
author Chris Cannam
date Fri, 23 Feb 2018 15:52:07 +0000
parents 4c8ae668cc8c
children 129ea1e6d783
comparison
equal deleted inserted replaced
11:bfffd8d7479a 12:7a779792577d
74 if (false === $parsed) { 74 if (false === $parsed) {
75 $this->valid = false; 75 $this->valid = false;
76 return; 76 return;
77 } 77 }
78 78
79 $this->scheme = isset($parsed['scheme']) ? $parsed['scheme'] : null; 79 $this->scheme = isset($parsed['scheme']) ? $parsed['scheme'] : null;
80 $this->host = isset($parsed['host']) ? $parsed['host'] : null; 80 $this->host = isset($parsed['host']) ? $parsed['host'] : null;
81 $this->port = isset($parsed['port']) ? $parsed['port'] : null; 81 $this->port = isset($parsed['port']) ? $parsed['port'] : null;
82 $this->user = isset($parsed['user']) ? $parsed['user'] : null; 82 $this->user = isset($parsed['user']) ? $parsed['user'] : null;
83 $this->pass = isset($parsed['pass']) ? $parsed['pass'] : null; 83 $this->pass = isset($parsed['pass']) ? $parsed['pass'] : null;
84 $this->path = isset($parsed['path']) ? $parsed['path'] : null; 84 $this->path = isset($parsed['path']) ? $parsed['path'] : null;
85 $this->query = isset($parsed['query']) ? $parsed['query'] : null; 85 $this->query = isset($parsed['query']) ? $parsed['query'] : null;
86 $this->fragment = isset($parsed['fragment']) ? $parsed['fragment'] : null; 86 $this->fragment = isset($parsed['fragment']) ? $parsed['fragment'] : null;
87 } 87 }
88 88
89 /** 89 /**
90 * Create an instance 90 * Create an instance
138 { 138 {
139 if (false === $this->valid) { 139 if (false === $this->valid) {
140 return false; 140 return false;
141 } 141 }
142 142
143 if ($this->scheme && !in_array($this->scheme, $this->validSchemes)) { 143 if ($this->scheme && ! in_array($this->scheme, $this->validSchemes)) {
144 return false; 144 return false;
145 } 145 }
146 146
147 if ($this->host) { 147 if ($this->host) {
148 if ($this->path && substr($this->path, 0, 1) != '/') { 148 if ($this->path && substr($this->path, 0, 1) != '/') {