Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:getgrav/grav-plugin-email into d…
Browse files Browse the repository at this point in the history
…evelop

� Conflicts:
�	CHANGELOG.md
  • Loading branch information
mahagr committed Feb 27, 2020
2 parents 3ddc994 + 90b12a3 commit e92d16b
Show file tree
Hide file tree
Showing 14 changed files with 256 additions and 78 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# v3.0.7
## mm/dd/2020

1. [](#improved)
* Updated email validator library again...
1. [](#bugfix)
* Fixed `Invalid resource theme://` on CLI command `test-email` on Grav 1.6.21 and later versions [#128](https://github.com/getgrav/grav-plugin-email/issues/128)

Expand Down
60 changes: 30 additions & 30 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/composer/ClassLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public function isClassMapAuthoritative()
*/
public function setApcuPrefix($apcuPrefix)
{
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
}

/**
Expand Down Expand Up @@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
$search = $subPath.'\\';
$search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
Expand Down
70 changes: 35 additions & 35 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,17 @@
},
{
"name": "egulias/email-validator",
"version": "2.1.15",
"version_normalized": "2.1.15.0",
"version": "2.1.17",
"version_normalized": "2.1.17.0",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
"reference": "e834eea5306d85d67de5a05db5882911d5b29357"
"reference": "ade6887fd9bd74177769645ab5c474824f8a418a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/e834eea5306d85d67de5a05db5882911d5b29357",
"reference": "e834eea5306d85d67de5a05db5882911d5b29357",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ade6887fd9bd74177769645ab5c474824f8a418a",
"reference": "ade6887fd9bd74177769645ab5c474824f8a418a",
"shasum": ""
},
"require": {
Expand All @@ -91,7 +91,7 @@
"suggest": {
"ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
},
"time": "2020-01-20T21:40:59+00:00",
"time": "2020-02-13T22:36:52+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -189,17 +189,17 @@
},
{
"name": "symfony/polyfill-iconv",
"version": "v1.13.1",
"version_normalized": "1.13.1.0",
"version": "v1.14.0",
"version_normalized": "1.14.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
"reference": "a019efccc03f1a335af6b4f20c30f5ea8060be36"
"reference": "926832ce51059bb58211b7b2080a88e0c3b5328e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/a019efccc03f1a335af6b4f20c30f5ea8060be36",
"reference": "a019efccc03f1a335af6b4f20c30f5ea8060be36",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/926832ce51059bb58211b7b2080a88e0c3b5328e",
"reference": "926832ce51059bb58211b7b2080a88e0c3b5328e",
"shasum": ""
},
"require": {
Expand All @@ -208,11 +208,11 @@
"suggest": {
"ext-iconv": "For best performance"
},
"time": "2019-11-27T13:56:44+00:00",
"time": "2020-01-13T11:15:53+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.13-dev"
"dev-master": "1.14-dev"
}
},
"installation-source": "dist",
Expand Down Expand Up @@ -250,32 +250,32 @@
},
{
"name": "symfony/polyfill-intl-idn",
"version": "v1.13.1",
"version_normalized": "1.13.1.0",
"version": "v1.14.0",
"version_normalized": "1.14.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46"
"reference": "6842f1a39cf7d580655688069a03dd7cd83d244a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6f9c239e61e1b0c9229a28ff89a812dc449c3d46",
"reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6842f1a39cf7d580655688069a03dd7cd83d244a",
"reference": "6842f1a39cf7d580655688069a03dd7cd83d244a",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"symfony/polyfill-mbstring": "^1.3",
"symfony/polyfill-php72": "^1.9"
"symfony/polyfill-php72": "^1.10"
},
"suggest": {
"ext-intl": "For best performance"
},
"time": "2019-11-27T13:56:44+00:00",
"time": "2020-01-17T12:01:36+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.13-dev"
"dev-master": "1.14-dev"
}
},
"installation-source": "dist",
Expand Down Expand Up @@ -314,17 +314,17 @@
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.13.1",
"version_normalized": "1.13.1.0",
"version": "v1.14.0",
"version_normalized": "1.14.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "7b4aab9743c30be783b73de055d24a39cf4b954f"
"reference": "34094cfa9abe1f0f14f48f490772db7a775559f2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f",
"reference": "7b4aab9743c30be783b73de055d24a39cf4b954f",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2",
"reference": "34094cfa9abe1f0f14f48f490772db7a775559f2",
"shasum": ""
},
"require": {
Expand All @@ -333,11 +333,11 @@
"suggest": {
"ext-mbstring": "For best performance"
},
"time": "2019-11-27T14:18:11+00:00",
"time": "2020-01-13T11:15:53+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.13-dev"
"dev-master": "1.14-dev"
}
},
"installation-source": "dist",
Expand Down Expand Up @@ -375,27 +375,27 @@
},
{
"name": "symfony/polyfill-php72",
"version": "v1.13.1",
"version_normalized": "1.13.1.0",
"version": "v1.14.0",
"version_normalized": "1.14.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "66fea50f6cb37a35eea048d75a7d99a45b586038"
"reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/66fea50f6cb37a35eea048d75a7d99a45b586038",
"reference": "66fea50f6cb37a35eea048d75a7d99a45b586038",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf",
"reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2019-11-27T13:56:44+00:00",
"time": "2020-01-13T11:15:53+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.13-dev"
"dev-master": "1.14-dev"
}
},
"installation-source": "dist",
Expand Down
Loading

0 comments on commit e92d16b

Please sign in to comment.