Laravel version update
Laravel version update
This commit is contained in:
@@ -1,10 +1,8 @@
|
||||
<?php
|
||||
/**
|
||||
* Zend Framework (http://framework.zend.com/)
|
||||
*
|
||||
* @link http://github.com/zendframework/zf2 for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @see https://github.com/zendframework/zend-uri for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
|
||||
* @license https://github.com/zendframework/zend-uri/blob/master/LICENSE.md New BSD License
|
||||
*/
|
||||
|
||||
namespace Zend\Uri\Exception;
|
||||
|
@@ -1,10 +1,8 @@
|
||||
<?php
|
||||
/**
|
||||
* Zend Framework (http://framework.zend.com/)
|
||||
*
|
||||
* @link http://github.com/zendframework/zf2 for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @see https://github.com/zendframework/zend-uri for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
|
||||
* @license https://github.com/zendframework/zend-uri/blob/master/LICENSE.md New BSD License
|
||||
*/
|
||||
|
||||
namespace Zend\Uri\Exception;
|
||||
|
@@ -1,10 +1,8 @@
|
||||
<?php
|
||||
/**
|
||||
* Zend Framework (http://framework.zend.com/)
|
||||
*
|
||||
* @link http://github.com/zendframework/zf2 for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @see https://github.com/zendframework/zend-uri for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
|
||||
* @license https://github.com/zendframework/zend-uri/blob/master/LICENSE.md New BSD License
|
||||
*/
|
||||
|
||||
namespace Zend\Uri\Exception;
|
||||
|
@@ -1,10 +1,8 @@
|
||||
<?php
|
||||
/**
|
||||
* Zend Framework (http://framework.zend.com/)
|
||||
*
|
||||
* @link http://github.com/zendframework/zf2 for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @see https://github.com/zendframework/zend-uri for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
|
||||
* @license https://github.com/zendframework/zend-uri/blob/master/LICENSE.md New BSD License
|
||||
*/
|
||||
|
||||
namespace Zend\Uri\Exception;
|
||||
|
8
vendor/zendframework/zend-uri/src/File.php
vendored
8
vendor/zendframework/zend-uri/src/File.php
vendored
@@ -1,10 +1,8 @@
|
||||
<?php
|
||||
/**
|
||||
* Zend Framework (http://framework.zend.com/)
|
||||
*
|
||||
* @link http://github.com/zendframework/zf2 for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @see https://github.com/zendframework/zend-uri for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
|
||||
* @license https://github.com/zendframework/zend-uri/blob/master/LICENSE.md New BSD License
|
||||
*/
|
||||
|
||||
namespace Zend\Uri;
|
||||
|
8
vendor/zendframework/zend-uri/src/Http.php
vendored
8
vendor/zendframework/zend-uri/src/Http.php
vendored
@@ -1,10 +1,8 @@
|
||||
<?php
|
||||
/**
|
||||
* Zend Framework (http://framework.zend.com/)
|
||||
*
|
||||
* @link http://github.com/zendframework/zf2 for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @see https://github.com/zendframework/zend-uri for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
|
||||
* @license https://github.com/zendframework/zend-uri/blob/master/LICENSE.md New BSD License
|
||||
*/
|
||||
|
||||
namespace Zend\Uri;
|
||||
|
8
vendor/zendframework/zend-uri/src/Mailto.php
vendored
8
vendor/zendframework/zend-uri/src/Mailto.php
vendored
@@ -1,10 +1,8 @@
|
||||
<?php
|
||||
/**
|
||||
* Zend Framework (http://framework.zend.com/)
|
||||
*
|
||||
* @link http://github.com/zendframework/zf2 for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @see https://github.com/zendframework/zend-uri for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
|
||||
* @license https://github.com/zendframework/zend-uri/blob/master/LICENSE.md New BSD License
|
||||
*/
|
||||
|
||||
namespace Zend\Uri;
|
||||
|
44
vendor/zendframework/zend-uri/src/Uri.php
vendored
44
vendor/zendframework/zend-uri/src/Uri.php
vendored
@@ -1,10 +1,8 @@
|
||||
<?php
|
||||
/**
|
||||
* Zend Framework (http://framework.zend.com/)
|
||||
*
|
||||
* @link http://github.com/zendframework/zf2 for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @see https://github.com/zendframework/zend-uri for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
|
||||
* @license https://github.com/zendframework/zend-uri/blob/master/LICENSE.md New BSD License
|
||||
*/
|
||||
|
||||
namespace Zend\Uri;
|
||||
@@ -315,7 +313,7 @@ class Uri implements UriInterface
|
||||
$this->setHost($authority);
|
||||
}
|
||||
|
||||
if (!$uri) {
|
||||
if (! $uri) {
|
||||
return $this;
|
||||
}
|
||||
|
||||
@@ -325,7 +323,7 @@ class Uri implements UriInterface
|
||||
$uri = substr($uri, strlen($match[0]));
|
||||
}
|
||||
|
||||
if (!$uri) {
|
||||
if (! $uri) {
|
||||
return $this;
|
||||
}
|
||||
|
||||
@@ -334,7 +332,7 @@ class Uri implements UriInterface
|
||||
$this->setQuery($match[1]);
|
||||
$uri = substr($uri, strlen($match[0]));
|
||||
}
|
||||
if (!$uri) {
|
||||
if (! $uri) {
|
||||
return $this;
|
||||
}
|
||||
|
||||
@@ -354,8 +352,8 @@ class Uri implements UriInterface
|
||||
*/
|
||||
public function toString()
|
||||
{
|
||||
if (!$this->isValid()) {
|
||||
if ($this->isAbsolute() || !$this->isValidRelative()) {
|
||||
if (! $this->isValid()) {
|
||||
if ($this->isAbsolute() || ! $this->isValidRelative()) {
|
||||
throw new Exception\InvalidUriException(
|
||||
'URI is not valid and cannot be converted into a string'
|
||||
);
|
||||
@@ -467,7 +465,7 @@ class Uri implements UriInterface
|
||||
|
||||
if (is_string($baseUri)) {
|
||||
$baseUri = new static($baseUri);
|
||||
} elseif (!$baseUri instanceof Uri) {
|
||||
} elseif (! $baseUri instanceof Uri) {
|
||||
throw new Exception\InvalidArgumentException(
|
||||
'Provided base URI must be a string or a Uri object'
|
||||
);
|
||||
@@ -479,16 +477,16 @@ class Uri implements UriInterface
|
||||
} else {
|
||||
$basePath = $baseUri->getPath();
|
||||
$relPath = $this->getPath();
|
||||
if (!$relPath) {
|
||||
if (! $relPath) {
|
||||
$this->setPath($basePath);
|
||||
if (!$this->getQuery()) {
|
||||
if (! $this->getQuery()) {
|
||||
$this->setQuery($baseUri->getQuery());
|
||||
}
|
||||
} else {
|
||||
if (substr($relPath, 0, 1) == '/') {
|
||||
$this->setPath(static::removePathDotSegments($relPath));
|
||||
} else {
|
||||
if ($baseUri->getHost() && !$basePath) {
|
||||
if ($baseUri->getHost() && ! $basePath) {
|
||||
$mergedPath = '/';
|
||||
} else {
|
||||
$mergedPath = substr($basePath, 0, strrpos($basePath, '/') + 1);
|
||||
@@ -570,7 +568,7 @@ class Uri implements UriInterface
|
||||
foreach ($matchingParts as $index => $segment) {
|
||||
// If we skip an index at any point, we have parent traversal, and
|
||||
// need to prepend the path accordingly
|
||||
if ($index && !isset($matchingParts[$index - 1])) {
|
||||
if ($index && ! isset($matchingParts[$index - 1])) {
|
||||
array_unshift($pathParts, '../');
|
||||
continue;
|
||||
}
|
||||
@@ -690,7 +688,7 @@ class Uri implements UriInterface
|
||||
*/
|
||||
public function setScheme($scheme)
|
||||
{
|
||||
if (($scheme !== null) && (!self::validateScheme($scheme))) {
|
||||
if (($scheme !== null) && (! self::validateScheme($scheme))) {
|
||||
throw new Exception\InvalidUriPartException(sprintf(
|
||||
'Scheme "%s" is not valid or is not accepted by %s',
|
||||
$scheme,
|
||||
@@ -738,7 +736,7 @@ class Uri implements UriInterface
|
||||
{
|
||||
if (($host !== '')
|
||||
&& ($host !== null)
|
||||
&& !self::validateHost($host, $this->validHostTypes)
|
||||
&& ! self::validateHost($host, $this->validHostTypes)
|
||||
) {
|
||||
throw new Exception\InvalidUriPartException(sprintf(
|
||||
'Host "%s" is not valid or is not accepted by %s',
|
||||
@@ -841,8 +839,8 @@ class Uri implements UriInterface
|
||||
*/
|
||||
public static function validateScheme($scheme)
|
||||
{
|
||||
if (!empty(static::$validSchemes)
|
||||
&& !in_array(strtolower($scheme), static::$validSchemes)
|
||||
if (! empty(static::$validSchemes)
|
||||
&& ! in_array(strtolower($scheme), static::$validSchemes)
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
@@ -972,7 +970,7 @@ class Uri implements UriInterface
|
||||
*/
|
||||
public static function encodeUserInfo($userInfo)
|
||||
{
|
||||
if (!is_string($userInfo)) {
|
||||
if (! is_string($userInfo)) {
|
||||
throw new Exception\InvalidArgumentException(sprintf(
|
||||
'Expecting a string, got %s',
|
||||
(is_object($userInfo) ? get_class($userInfo) : gettype($userInfo))
|
||||
@@ -1000,14 +998,14 @@ class Uri implements UriInterface
|
||||
*/
|
||||
public static function encodePath($path)
|
||||
{
|
||||
if (!is_string($path)) {
|
||||
if (! is_string($path)) {
|
||||
throw new Exception\InvalidArgumentException(sprintf(
|
||||
'Expecting a string, got %s',
|
||||
(is_object($path) ? get_class($path) : gettype($path))
|
||||
));
|
||||
}
|
||||
|
||||
$regex = '/(?:[^' . self::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/';
|
||||
$regex = '/(?:[^' . self::CHAR_UNRESERVED . ')(:@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/';
|
||||
$escaper = static::getEscaper();
|
||||
$replace = function ($match) use ($escaper) {
|
||||
return $escaper->escapeUrl($match[0]);
|
||||
@@ -1029,7 +1027,7 @@ class Uri implements UriInterface
|
||||
*/
|
||||
public static function encodeQueryFragment($input)
|
||||
{
|
||||
if (!is_string($input)) {
|
||||
if (! is_string($input)) {
|
||||
throw new Exception\InvalidArgumentException(sprintf(
|
||||
'Expecting a string, got %s',
|
||||
(is_object($input) ? get_class($input) : gettype($input))
|
||||
|
14
vendor/zendframework/zend-uri/src/UriFactory.php
vendored
14
vendor/zendframework/zend-uri/src/UriFactory.php
vendored
@@ -1,10 +1,8 @@
|
||||
<?php
|
||||
/**
|
||||
* Zend Framework (http://framework.zend.com/)
|
||||
*
|
||||
* @link http://github.com/zendframework/zf2 for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @see https://github.com/zendframework/zend-uri for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
|
||||
* @license https://github.com/zendframework/zend-uri/blob/master/LICENSE.md New BSD License
|
||||
*/
|
||||
|
||||
namespace Zend\Uri;
|
||||
@@ -26,7 +24,7 @@ abstract class UriFactory
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected static $schemeClasses = [
|
||||
protected static $schemeClasses = [
|
||||
'http' => 'Zend\Uri\Http',
|
||||
'https' => 'Zend\Uri\Http',
|
||||
'mailto' => 'Zend\Uri\Mailto',
|
||||
@@ -87,7 +85,7 @@ abstract class UriFactory
|
||||
*/
|
||||
public static function factory($uriString, $defaultScheme = null)
|
||||
{
|
||||
if (!is_string($uriString)) {
|
||||
if (! is_string($uriString)) {
|
||||
throw new Exception\InvalidArgumentException(sprintf(
|
||||
'Expecting a string, received "%s"',
|
||||
(is_object($uriString) ? get_class($uriString) : gettype($uriString))
|
||||
@@ -96,7 +94,7 @@ abstract class UriFactory
|
||||
|
||||
$uri = new Uri($uriString);
|
||||
$scheme = strtolower($uri->getScheme());
|
||||
if (!$scheme && $defaultScheme) {
|
||||
if (! $scheme && $defaultScheme) {
|
||||
$scheme = $defaultScheme;
|
||||
}
|
||||
|
||||
|
@@ -1,10 +1,8 @@
|
||||
<?php
|
||||
/**
|
||||
* Zend Framework (http://framework.zend.com/)
|
||||
*
|
||||
* @link http://github.com/zendframework/zf2 for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @see https://github.com/zendframework/zend-uri for the canonical source repository
|
||||
* @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
|
||||
* @license https://github.com/zendframework/zend-uri/blob/master/LICENSE.md New BSD License
|
||||
*/
|
||||
|
||||
namespace Zend\Uri;
|
||||
|
Reference in New Issue
Block a user