Skip to content
Snippets Groups Projects
Unverified Commit bd5757e1 authored by briancanini's avatar briancanini Committed by GitHub
Browse files

Merge pull request #87 from ASCWebServices/d867

Hotfix update core:  8.6.6  -->  8.6.7
parents 89460f93 16671317
No related branches found
No related tags found
No related merge requests found
......@@ -2376,16 +2376,16 @@
},
{
"name": "drupal/core",
"version": "8.6.6",
"version": "8.6.7",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
"reference": "6736973f399a3a9ac8ecd41f3a159e1153f7ee39"
"reference": "e0a09bda1da7552204464894811a59387608c9f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/drupal/core/zipball/6736973f399a3a9ac8ecd41f3a159e1153f7ee39",
"reference": "6736973f399a3a9ac8ecd41f3a159e1153f7ee39",
"url": "https://api.github.com/repos/drupal/core/zipball/e0a09bda1da7552204464894811a59387608c9f9",
"reference": "e0a09bda1da7552204464894811a59387608c9f9",
"shasum": ""
},
"require": {
......@@ -2614,7 +2614,7 @@
"GPL-2.0-or-later"
],
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"time": "2019-01-15T17:41:52+00:00"
"time": "2019-01-16T23:30:03+00:00"
},
{
"name": "drupal/crop",
......
......@@ -2455,17 +2455,17 @@
},
{
"name": "drupal/core",
"version": "8.6.6",
"version_normalized": "8.6.6.0",
"version": "8.6.7",
"version_normalized": "8.6.7.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
"reference": "6736973f399a3a9ac8ecd41f3a159e1153f7ee39"
"reference": "e0a09bda1da7552204464894811a59387608c9f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/drupal/core/zipball/6736973f399a3a9ac8ecd41f3a159e1153f7ee39",
"reference": "6736973f399a3a9ac8ecd41f3a159e1153f7ee39",
"url": "https://api.github.com/repos/drupal/core/zipball/e0a09bda1da7552204464894811a59387608c9f9",
"reference": "e0a09bda1da7552204464894811a59387608c9f9",
"shasum": ""
},
"require": {
......@@ -2638,7 +2638,7 @@
"symfony/debug": "^3.4.0",
"symfony/phpunit-bridge": "^3.4.3"
},
"time": "2019-01-15T17:41:52+00:00",
"time": "2019-01-16T23:30:03+00:00",
"type": "drupal-core",
"extra": {
"merge-plugin": {
......
......@@ -82,7 +82,7 @@ class Drupal {
/**
* The current system version.
*/
const VERSION = '8.6.6';
const VERSION = '8.6.7';
/**
* Core API compatibility.
......
......@@ -22,7 +22,6 @@ class PharExtensionInterceptor implements Assertable {
*
* @param string $path
* The path of the phar file to check.
*
* @param string $command
* The command being carried out.
*
......@@ -46,6 +45,8 @@ public function assert($path, $command) {
}
/**
* Determines if a path has a .phar extension or invoked execution.
*
* @param string $path
* The path of the phar file to check.
*
......@@ -62,8 +63,13 @@ private function baseFileContainsPharExtension($path) {
// not not have .phar extension then this should be allowed. For
// example, some CLI tools recommend removing the extension.
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
$caller = array_pop($backtrace);
if (isset($caller['file']) && $baseFile === $caller['file']) {
// Find the last entry in the backtrace containing a 'file' key as
// sometimes the last caller is executed outside the scope of a file. For
// example, this occurs with shutdown functions.
do {
$caller = array_pop($backtrace);
} while (empty($caller['file']) && !empty($backtrace));
if (isset($caller['file']) && $baseFile === Helper::determineBaseFile($caller['file'])) {
return TRUE;
}
$fileExtension = pathinfo($baseFile, PATHINFO_EXTENSION);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment