updated core
This commit is contained in:
@@ -1,3 +1,30 @@
|
|||||||
|
Drupal 7.63, 2019-01-16
|
||||||
|
-----------------------
|
||||||
|
- Fixed a fatal error for some Drush users introduced by SA-CORE-2019-002.
|
||||||
|
|
||||||
|
Drupal 7.62, 2019-01-15
|
||||||
|
-----------------------
|
||||||
|
- Fixed security issues:
|
||||||
|
- SA-CORE-2019-001
|
||||||
|
- SA-CORE-2019-002
|
||||||
|
|
||||||
|
Drupal 7.61, 2018-11-07
|
||||||
|
-----------------------
|
||||||
|
- File upload validation functions and hook_file_validate() implementations are
|
||||||
|
now always passed the correct file URI.
|
||||||
|
- The default form cache expiration of 6 hours is now configurable (API
|
||||||
|
addition: https://www.drupal.org/node/2857751).
|
||||||
|
- Allowed callers of drupal_http_request() to optionally specify an explicit
|
||||||
|
Host header.
|
||||||
|
- Allowed the + character to appear in usernames.
|
||||||
|
- PHP 7.2: Fixed Archive_Tar incompatibility.
|
||||||
|
- PHP 7.2: Removed deprecated function each().
|
||||||
|
- PHP 7.2: Avoid count() calls on uncountable variables.
|
||||||
|
- PHP 7.2: Removed deprecated create_function() call.
|
||||||
|
- PHP 7.2: Make sure variables are arrays in theme_links().
|
||||||
|
- Fixed theme-settings.php not being loaded on cached forms
|
||||||
|
- Fixed problem with IE11 & Chrome(PointerEvents enabled) & some Firefox scroll to the top of the page after dragging the bottom item with jquery 1.5 <-> 1.11
|
||||||
|
|
||||||
Drupal 7.60, 2018-10-18
|
Drupal 7.60, 2018-10-18
|
||||||
------------------------
|
------------------------
|
||||||
- Fixed security issues. See SA-CORE-2018-006.
|
- Fixed security issues. See SA-CORE-2018-006.
|
||||||
@@ -8,7 +35,7 @@ Drupal 7.59, 2018-04-25
|
|||||||
|
|
||||||
Drupal 7.58, 2018-03-28
|
Drupal 7.58, 2018-03-28
|
||||||
-----------------------
|
-----------------------
|
||||||
- Fixed security issues (multiple vulnerabilities). See SA-CORE-2018-002.
|
- Fixed security issues (remote code execution). See SA-CORE-2018-002.
|
||||||
|
|
||||||
Drupal 7.57, 2018-02-21
|
Drupal 7.57, 2018-02-21
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ The branch maintainers for Drupal 7 are:
|
|||||||
- Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx
|
- Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx
|
||||||
- David Rothstein 'David_Rothstein' https://www.drupal.org/u/david_rothstein
|
- David Rothstein 'David_Rothstein' https://www.drupal.org/u/david_rothstein
|
||||||
- Stefan Ruijsenaars 'stefan.r' https://www.drupal.org/u/stefanr-0
|
- Stefan Ruijsenaars 'stefan.r' https://www.drupal.org/u/stefanr-0
|
||||||
|
- (provisional) Pol Dellaiera 'Pol' https://www.drupal.org/u/pol
|
||||||
|
|
||||||
|
|
||||||
Component maintainers
|
Component maintainers
|
||||||
@@ -44,10 +45,9 @@ Cron system
|
|||||||
- Derek Wright 'dww' https://www.drupal.org/u/dww
|
- Derek Wright 'dww' https://www.drupal.org/u/dww
|
||||||
|
|
||||||
Database system
|
Database system
|
||||||
- Larry Garfield 'Crell' https://www.drupal.org/u/crell
|
- ?
|
||||||
|
|
||||||
- MySQL driver
|
- MySQL driver
|
||||||
- Larry Garfield 'Crell' https://www.drupal.org/u/crell
|
|
||||||
- David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss
|
- David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss
|
||||||
|
|
||||||
- PostgreSQL driver
|
- PostgreSQL driver
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
/**
|
/**
|
||||||
* The current system version.
|
* The current system version.
|
||||||
*/
|
*/
|
||||||
define('VERSION', '7.60');
|
define('VERSION', '7.63');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Core API compatibility.
|
* Core API compatibility.
|
||||||
@@ -704,6 +704,19 @@ function drupal_environment_initialize() {
|
|||||||
// Set sane locale settings, to ensure consistent string, dates, times and
|
// Set sane locale settings, to ensure consistent string, dates, times and
|
||||||
// numbers handling.
|
// numbers handling.
|
||||||
setlocale(LC_ALL, 'C');
|
setlocale(LC_ALL, 'C');
|
||||||
|
|
||||||
|
// PHP's built-in phar:// stream wrapper is not sufficiently secure. Override
|
||||||
|
// it with a more secure one, which requires PHP 5.3.3. For lower versions,
|
||||||
|
// unregister the built-in one without replacing it. Sites needing phar
|
||||||
|
// support for lower PHP versions must implement hook_stream_wrappers() to
|
||||||
|
// register their desired implementation.
|
||||||
|
if (in_array('phar', stream_get_wrappers(), TRUE)) {
|
||||||
|
stream_wrapper_unregister('phar');
|
||||||
|
if (version_compare(PHP_VERSION, '5.3.3', '>=')) {
|
||||||
|
include_once DRUPAL_ROOT . '/includes/file.phar.inc';
|
||||||
|
file_register_phar_wrapper();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -3785,8 +3798,12 @@ function _drupal_shutdown_function() {
|
|||||||
chdir(DRUPAL_ROOT);
|
chdir(DRUPAL_ROOT);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
while (list($key, $callback) = each($callbacks)) {
|
// Manually iterate over the array instead of using a foreach loop.
|
||||||
|
// A foreach operates on a copy of the array, so any shutdown functions that
|
||||||
|
// were added from other shutdown functions would never be called.
|
||||||
|
while ($callback = current($callbacks)) {
|
||||||
call_user_func_array($callback['callback'], $callback['arguments']);
|
call_user_func_array($callback['callback'], $callback['arguments']);
|
||||||
|
next($callbacks);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception $exception) {
|
catch (Exception $exception) {
|
||||||
|
|||||||
@@ -867,8 +867,10 @@ function drupal_http_request($url, array $options = array()) {
|
|||||||
// Make the socket connection to a proxy server.
|
// Make the socket connection to a proxy server.
|
||||||
$socket = 'tcp://' . $proxy_server . ':' . variable_get('proxy_port', 8080);
|
$socket = 'tcp://' . $proxy_server . ':' . variable_get('proxy_port', 8080);
|
||||||
// The Host header still needs to match the real request.
|
// The Host header still needs to match the real request.
|
||||||
|
if (!isset($options['headers']['Host'])) {
|
||||||
$options['headers']['Host'] = $uri['host'];
|
$options['headers']['Host'] = $uri['host'];
|
||||||
$options['headers']['Host'] .= isset($uri['port']) && $uri['port'] != 80 ? ':' . $uri['port'] : '';
|
$options['headers']['Host'] .= isset($uri['port']) && $uri['port'] != 80 ? ':' . $uri['port'] : '';
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'http':
|
case 'http':
|
||||||
@@ -878,14 +880,18 @@ function drupal_http_request($url, array $options = array()) {
|
|||||||
// RFC 2616: "non-standard ports MUST, default ports MAY be included".
|
// RFC 2616: "non-standard ports MUST, default ports MAY be included".
|
||||||
// We don't add the standard port to prevent from breaking rewrite rules
|
// We don't add the standard port to prevent from breaking rewrite rules
|
||||||
// checking the host that do not take into account the port number.
|
// checking the host that do not take into account the port number.
|
||||||
|
if (!isset($options['headers']['Host'])) {
|
||||||
$options['headers']['Host'] = $uri['host'] . ($port != 80 ? ':' . $port : '');
|
$options['headers']['Host'] = $uri['host'] . ($port != 80 ? ':' . $port : '');
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'https':
|
case 'https':
|
||||||
// Note: Only works when PHP is compiled with OpenSSL support.
|
// Note: Only works when PHP is compiled with OpenSSL support.
|
||||||
$port = isset($uri['port']) ? $uri['port'] : 443;
|
$port = isset($uri['port']) ? $uri['port'] : 443;
|
||||||
$socket = 'ssl://' . $uri['host'] . ':' . $port;
|
$socket = 'ssl://' . $uri['host'] . ':' . $port;
|
||||||
|
if (!isset($options['headers']['Host'])) {
|
||||||
$options['headers']['Host'] = $uri['host'] . ($port != 443 ? ':' . $port : '');
|
$options['headers']['Host'] = $uri['host'] . ($port != 443 ? ':' . $port : '');
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -1534,9 +1534,9 @@ function file_save_upload($form_field_name, $validators = array(), $destination
|
|||||||
// rename filename.php.foo and filename.php to filename.php.foo.txt and
|
// rename filename.php.foo and filename.php to filename.php.foo.txt and
|
||||||
// filename.php.txt, respectively). Don't rename if 'allow_insecure_uploads'
|
// filename.php.txt, respectively). Don't rename if 'allow_insecure_uploads'
|
||||||
// evaluates to TRUE.
|
// evaluates to TRUE.
|
||||||
if (!variable_get('allow_insecure_uploads', 0) && preg_match('/\.(php|pl|py|cgi|asp|js)(\.|$)/i', $file->filename) && (substr($file->filename, -4) != '.txt')) {
|
if (!variable_get('allow_insecure_uploads', 0) && preg_match('/\.(php|phar|pl|py|cgi|asp|js)(\.|$)/i', $file->filename) && (substr($file->filename, -4) != '.txt')) {
|
||||||
$file->filemime = 'text/plain';
|
$file->filemime = 'text/plain';
|
||||||
$file->uri .= '.txt';
|
// The destination filename will also later be used to create the URI.
|
||||||
$file->filename .= '.txt';
|
$file->filename .= '.txt';
|
||||||
// The .txt extension may not be in the allowed list of extensions. We have
|
// The .txt extension may not be in the allowed list of extensions. We have
|
||||||
// to add it here or else the file upload will fail.
|
// to add it here or else the file upload will fail.
|
||||||
|
|||||||
41
includes/file.phar.inc
Normal file
41
includes/file.phar.inc
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Drupal\Core\Security\PharExtensionInterceptor;
|
||||||
|
use TYPO3\PharStreamWrapper\Manager as PharStreamWrapperManager;
|
||||||
|
use TYPO3\PharStreamWrapper\Behavior as PharStreamWrapperBehavior;
|
||||||
|
use TYPO3\PharStreamWrapper\PharStreamWrapper;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers a phar stream wrapper that is more secure than PHP's built-in one.
|
||||||
|
*
|
||||||
|
* @see file_get_stream_wrappers()
|
||||||
|
*/
|
||||||
|
function file_register_phar_wrapper() {
|
||||||
|
$directory = DRUPAL_ROOT . '/misc/typo3/phar-stream-wrapper/src';
|
||||||
|
include_once $directory . '/Assertable.php';
|
||||||
|
include_once $directory . '/Behavior.php';
|
||||||
|
include_once $directory . '/Exception.php';
|
||||||
|
include_once $directory . '/Helper.php';
|
||||||
|
include_once $directory . '/Manager.php';
|
||||||
|
include_once $directory . '/PharStreamWrapper.php';
|
||||||
|
include_once DRUPAL_ROOT . '/misc/typo3/drupal-security/PharExtensionInterceptor.php';
|
||||||
|
|
||||||
|
// Set up a stream wrapper to handle insecurities due to PHP's built-in
|
||||||
|
// phar stream wrapper.
|
||||||
|
try {
|
||||||
|
$behavior = new PharStreamWrapperBehavior();
|
||||||
|
PharStreamWrapperManager::initialize(
|
||||||
|
$behavior->withAssertion(new PharExtensionInterceptor())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
catch (\LogicException $e) {
|
||||||
|
// Continue if the PharStreamWrapperManager is already initialized.
|
||||||
|
// For example, this occurs following a drupal_static_reset(), such
|
||||||
|
// as during tests.
|
||||||
|
};
|
||||||
|
|
||||||
|
// To prevent file_stream_wrapper_valid_scheme() treating "phar" as a valid
|
||||||
|
// scheme, this is registered with PHP only, not with hook_stream_wrappers()
|
||||||
|
// or the internal storage of file_get_stream_wrappers().
|
||||||
|
stream_wrapper_register('phar', '\\TYPO3\\PharStreamWrapper\\PharStreamWrapper');
|
||||||
|
}
|
||||||
@@ -555,8 +555,10 @@ function form_get_cache($form_build_id, &$form_state) {
|
|||||||
* Stores a form in the cache.
|
* Stores a form in the cache.
|
||||||
*/
|
*/
|
||||||
function form_set_cache($form_build_id, $form, $form_state) {
|
function form_set_cache($form_build_id, $form, $form_state) {
|
||||||
// 6 hours cache life time for forms should be plenty.
|
// The default cache_form expiration is 6 hours. On busy sites, the cache_form
|
||||||
$expire = 21600;
|
// table can become very large. A shorter cache lifetime can help to keep the
|
||||||
|
// table's size under control.
|
||||||
|
$expire = variable_get('form_cache_expiration', 21600);
|
||||||
|
|
||||||
// Ensure that the form build_id embedded in the form structure is the same as
|
// Ensure that the form build_id embedded in the form structure is the same as
|
||||||
// the one passed in as a parameter. This is an additional safety measure to
|
// the one passed in as a parameter. This is an additional safety measure to
|
||||||
@@ -1438,10 +1440,12 @@ function _form_validate(&$elements, &$form_state, $form_id = NULL) {
|
|||||||
// length if it's a string, and the item count if it's an array.
|
// length if it's a string, and the item count if it's an array.
|
||||||
// An unchecked checkbox has a #value of integer 0, different than string
|
// An unchecked checkbox has a #value of integer 0, different than string
|
||||||
// '0', which could be a valid value.
|
// '0', which could be a valid value.
|
||||||
$is_empty_multiple = (!count($elements['#value']));
|
$is_countable = is_array($elements['#value']) || $elements['#value'] instanceof Countable;
|
||||||
|
$is_empty_multiple = $is_countable && count($elements['#value']) == 0;
|
||||||
$is_empty_string = (is_string($elements['#value']) && drupal_strlen(trim($elements['#value'])) == 0);
|
$is_empty_string = (is_string($elements['#value']) && drupal_strlen(trim($elements['#value'])) == 0);
|
||||||
$is_empty_value = ($elements['#value'] === 0);
|
$is_empty_value = ($elements['#value'] === 0);
|
||||||
if ($is_empty_multiple || $is_empty_string || $is_empty_value) {
|
$is_empty_null = is_null($elements['#value']);
|
||||||
|
if ($is_empty_multiple || $is_empty_string || $is_empty_value || $is_empty_null) {
|
||||||
// Although discouraged, a #title is not mandatory for form elements. In
|
// Although discouraged, a #title is not mandatory for form elements. In
|
||||||
// case there is no #title, we cannot set a form error message.
|
// case there is no #title, we cannot set a form error message.
|
||||||
// Instead of setting no #title, form constructors are encouraged to set
|
// Instead of setting no #title, form constructors are encouraged to set
|
||||||
|
|||||||
@@ -779,7 +779,7 @@ function drupal_uninstall_modules($module_list = array(), $uninstall_dependents
|
|||||||
$module_list = array_flip(array_values($module_list));
|
$module_list = array_flip(array_values($module_list));
|
||||||
|
|
||||||
$profile = drupal_get_profile();
|
$profile = drupal_get_profile();
|
||||||
while (list($module) = each($module_list)) {
|
foreach (array_keys($module_list) as $module) {
|
||||||
if (!isset($module_data[$module]) || drupal_get_installed_schema_version($module) == SCHEMA_UNINSTALLED) {
|
if (!isset($module_data[$module]) || drupal_get_installed_schema_version($module) == SCHEMA_UNINSTALLED) {
|
||||||
// This module doesn't exist or is already uninstalled. Skip it.
|
// This module doesn't exist or is already uninstalled. Skip it.
|
||||||
unset($module_list[$module]);
|
unset($module_list[$module]);
|
||||||
|
|||||||
@@ -576,7 +576,8 @@ function _menu_load_objects(&$item, &$map) {
|
|||||||
// 'load arguments' in the hook_menu() entry, but they need
|
// 'load arguments' in the hook_menu() entry, but they need
|
||||||
// some processing. In this case the $function is the key to the
|
// some processing. In this case the $function is the key to the
|
||||||
// load_function array, and the value is the list of arguments.
|
// load_function array, and the value is the list of arguments.
|
||||||
list($function, $args) = each($function);
|
$args = current($function);
|
||||||
|
$function = key($function);
|
||||||
$load_functions[$index] = $function;
|
$load_functions[$index] = $function;
|
||||||
|
|
||||||
// Some arguments are placeholders for dynamic items to process.
|
// Some arguments are placeholders for dynamic items to process.
|
||||||
@@ -2402,7 +2403,8 @@ function menu_set_active_trail($new_trail = NULL) {
|
|||||||
// a stripped down menu tree containing the active trail only, in case
|
// a stripped down menu tree containing the active trail only, in case
|
||||||
// the given menu has not been built in this request yet.
|
// the given menu has not been built in this request yet.
|
||||||
$tree = menu_tree_page_data($preferred_link['menu_name'], NULL, TRUE);
|
$tree = menu_tree_page_data($preferred_link['menu_name'], NULL, TRUE);
|
||||||
list($key, $curr) = each($tree);
|
$curr = current($tree);
|
||||||
|
next($tree);
|
||||||
}
|
}
|
||||||
// There is no link for the current path.
|
// There is no link for the current path.
|
||||||
else {
|
else {
|
||||||
@@ -2432,7 +2434,8 @@ function menu_set_active_trail($new_trail = NULL) {
|
|||||||
}
|
}
|
||||||
$tree = $curr['below'] ? $curr['below'] : array();
|
$tree = $curr['below'] ? $curr['below'] : array();
|
||||||
}
|
}
|
||||||
list($key, $curr) = each($tree);
|
$curr = current($tree);
|
||||||
|
next($tree);
|
||||||
}
|
}
|
||||||
// Make sure the current page is in the trail to build the page title, by
|
// Make sure the current page is in the trail to build the page title, by
|
||||||
// appending either the preferred link or the menu router item for the
|
// appending either the preferred link or the menu router item for the
|
||||||
|
|||||||
@@ -404,7 +404,11 @@ function module_enable($module_list, $enable_dependencies = TRUE) {
|
|||||||
// Create an associative array with weights as values.
|
// Create an associative array with weights as values.
|
||||||
$module_list = array_flip(array_values($module_list));
|
$module_list = array_flip(array_values($module_list));
|
||||||
|
|
||||||
while (list($module) = each($module_list)) {
|
// The array is iterated over manually (instead of using a foreach) because
|
||||||
|
// modules may be added to the list within the loop and we need to process
|
||||||
|
// them.
|
||||||
|
while ($module = key($module_list)) {
|
||||||
|
next($module_list);
|
||||||
if (!isset($module_data[$module])) {
|
if (!isset($module_data[$module])) {
|
||||||
// This module is not found in the filesystem, abort.
|
// This module is not found in the filesystem, abort.
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@@ -540,7 +544,11 @@ function module_disable($module_list, $disable_dependents = TRUE) {
|
|||||||
$module_list = array_flip(array_values($module_list));
|
$module_list = array_flip(array_values($module_list));
|
||||||
|
|
||||||
$profile = drupal_get_profile();
|
$profile = drupal_get_profile();
|
||||||
while (list($module) = each($module_list)) {
|
// The array is iterated over manually (instead of using a foreach) because
|
||||||
|
// modules may be added to the list within the loop and we need to process
|
||||||
|
// them.
|
||||||
|
while ($module = key($module_list)) {
|
||||||
|
next($module_list);
|
||||||
if (!isset($module_data[$module]) || !$module_data[$module]->status) {
|
if (!isset($module_data[$module]) || !$module_data[$module]->status) {
|
||||||
// This module doesn't exist or is already disabled, skip it.
|
// This module doesn't exist or is already disabled, skip it.
|
||||||
unset($module_list[$module]);
|
unset($module_list[$module]);
|
||||||
|
|||||||
@@ -1776,13 +1776,13 @@ function theme_link($variables) {
|
|||||||
* http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
|
* http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
|
||||||
*/
|
*/
|
||||||
function theme_links($variables) {
|
function theme_links($variables) {
|
||||||
$links = $variables['links'];
|
$links = (array) $variables['links'];
|
||||||
$attributes = $variables['attributes'];
|
$attributes = (array) $variables['attributes'];
|
||||||
$heading = $variables['heading'];
|
$heading = $variables['heading'];
|
||||||
global $language_url;
|
global $language_url;
|
||||||
$output = '';
|
$output = '';
|
||||||
|
|
||||||
if (count($links) > 0) {
|
if (!empty($links)) {
|
||||||
// Treat the heading first if it is present to prepend it to the
|
// Treat the heading first if it is present to prepend it to the
|
||||||
// list of links.
|
// list of links.
|
||||||
if (!empty($heading)) {
|
if (!empty($heading)) {
|
||||||
@@ -1995,7 +1995,7 @@ function theme_table($variables) {
|
|||||||
$empty = $variables['empty'];
|
$empty = $variables['empty'];
|
||||||
|
|
||||||
// Add sticky headers, if applicable.
|
// Add sticky headers, if applicable.
|
||||||
if (count($header) && $sticky) {
|
if (!empty($header) && $sticky) {
|
||||||
drupal_add_js('misc/tableheader.js');
|
drupal_add_js('misc/tableheader.js');
|
||||||
// Add 'sticky-enabled' class to the table to identify it for JS.
|
// Add 'sticky-enabled' class to the table to identify it for JS.
|
||||||
// This is needed to target tables constructed by this function.
|
// This is needed to target tables constructed by this function.
|
||||||
@@ -2009,7 +2009,7 @@ function theme_table($variables) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Format the table columns:
|
// Format the table columns:
|
||||||
if (count($colgroups)) {
|
if (!empty($colgroups)) {
|
||||||
foreach ($colgroups as $number => $colgroup) {
|
foreach ($colgroups as $number => $colgroup) {
|
||||||
$attributes = array();
|
$attributes = array();
|
||||||
|
|
||||||
@@ -2044,8 +2044,9 @@ function theme_table($variables) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Add the 'empty' row message if available.
|
// Add the 'empty' row message if available.
|
||||||
if (!count($rows) && $empty) {
|
if (empty($rows) && $empty) {
|
||||||
$header_count = 0;
|
$header_count = 0;
|
||||||
|
if (!empty($header)) {
|
||||||
foreach ($header as $header_cell) {
|
foreach ($header as $header_cell) {
|
||||||
if (is_array($header_cell)) {
|
if (is_array($header_cell)) {
|
||||||
$header_count += isset($header_cell['colspan']) ? $header_cell['colspan'] : 1;
|
$header_count += isset($header_cell['colspan']) ? $header_cell['colspan'] : 1;
|
||||||
@@ -2054,28 +2055,29 @@ function theme_table($variables) {
|
|||||||
$header_count++;
|
$header_count++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
$rows[] = array(array('data' => $empty, 'colspan' => $header_count, 'class' => array('empty', 'message')));
|
$rows[] = array(array('data' => $empty, 'colspan' => $header_count, 'class' => array('empty', 'message')));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Format the table header:
|
// Format the table header:
|
||||||
if (count($header)) {
|
if (!empty($header)) {
|
||||||
$ts = tablesort_init($header);
|
$ts = tablesort_init($header);
|
||||||
// HTML requires that the thead tag has tr tags in it followed by tbody
|
// HTML requires that the thead tag has tr tags in it followed by tbody
|
||||||
// tags. Using ternary operator to check and see if we have any rows.
|
// tags. Using ternary operator to check and see if we have any rows.
|
||||||
$output .= (count($rows) ? ' <thead><tr>' : ' <tr>');
|
$output .= (!empty($rows) ? ' <thead><tr>' : ' <tr>');
|
||||||
foreach ($header as $cell) {
|
foreach ($header as $cell) {
|
||||||
$cell = tablesort_header($cell, $header, $ts);
|
$cell = tablesort_header($cell, $header, $ts);
|
||||||
$output .= _theme_table_cell($cell, TRUE);
|
$output .= _theme_table_cell($cell, TRUE);
|
||||||
}
|
}
|
||||||
// Using ternary operator to close the tags based on whether or not there are rows
|
// Using ternary operator to close the tags based on whether or not there are rows
|
||||||
$output .= (count($rows) ? " </tr></thead>\n" : "</tr>\n");
|
$output .= (!empty($rows) ? " </tr></thead>\n" : "</tr>\n");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$ts = array();
|
$ts = array();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Format the table rows:
|
// Format the table rows:
|
||||||
if (count($rows)) {
|
if (!empty($rows)) {
|
||||||
$output .= "<tbody>\n";
|
$output .= "<tbody>\n";
|
||||||
$flip = array('even' => 'odd', 'odd' => 'even');
|
$flip = array('even' => 'odd', 'odd' => 'even');
|
||||||
$class = 'even';
|
$class = 'even';
|
||||||
@@ -2095,7 +2097,7 @@ function theme_table($variables) {
|
|||||||
$attributes = array();
|
$attributes = array();
|
||||||
$no_striping = FALSE;
|
$no_striping = FALSE;
|
||||||
}
|
}
|
||||||
if (count($cells)) {
|
if (!empty($cells)) {
|
||||||
// Add odd/even class
|
// Add odd/even class
|
||||||
if (!$no_striping) {
|
if (!$no_striping) {
|
||||||
$class = $flip[$class];
|
$class = $flip[$class];
|
||||||
|
|||||||
@@ -580,21 +580,43 @@ Drupal.tableDrag.prototype.dropRow = function (event, self) {
|
|||||||
* Get the mouse coordinates from the event (allowing for browser differences).
|
* Get the mouse coordinates from the event (allowing for browser differences).
|
||||||
*/
|
*/
|
||||||
Drupal.tableDrag.prototype.mouseCoords = function (event) {
|
Drupal.tableDrag.prototype.mouseCoords = function (event) {
|
||||||
// Complete support for pointer events was only introduced to jQuery in
|
|
||||||
// version 1.11.1; between versions 1.7 and 1.11.0 pointer events have the
|
|
||||||
// clientX and clientY properties undefined. In those cases, the properties
|
|
||||||
// must be retrieved from the event.originalEvent object instead.
|
|
||||||
var clientX = event.clientX || event.originalEvent.clientX;
|
|
||||||
var clientY = event.clientY || event.originalEvent.clientY;
|
|
||||||
|
|
||||||
if (event.pageX || event.pageY) {
|
// Match both null and undefined, but not zero, by using != null.
|
||||||
|
// See https://stackoverflow.com/questions/2647867/how-to-determine-if-variable-is-undefined-or-null
|
||||||
|
if (event.pageX != null && event.pageY != null) {
|
||||||
return {x: event.pageX, y: event.pageY};
|
return {x: event.pageX, y: event.pageY};
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
// Complete support for pointer events was only introduced to jQuery in
|
||||||
x: clientX + document.body.scrollLeft - document.body.clientLeft,
|
// version 1.11.1; between versions 1.7 and 1.11.0 pointer events have the
|
||||||
y: clientY + document.body.scrollTop - document.body.clientTop
|
// pageX and pageY properties undefined. In those cases, the properties must
|
||||||
};
|
// be retrieved from the event.originalEvent object instead.
|
||||||
|
if (event.originalEvent && event.originalEvent.pageX != null && event.originalEvent.pageY != null) {
|
||||||
|
return {x: event.originalEvent.pageX, y: event.originalEvent.pageY};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Some old browsers do not support MouseEvent.pageX and *.pageY at all.
|
||||||
|
// See https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/pageY
|
||||||
|
// For those, we look at event.clientX and event.clientY instead.
|
||||||
|
if (event.clientX == null || event.clientY == null) {
|
||||||
|
// In some jQuery versions, some events created by jQuery do not have
|
||||||
|
// clientX and clientY. But the original event might have.
|
||||||
|
if (!event.originalEvent) {
|
||||||
|
throw new Error("The event has no coordinates, and no event.originalEvent.");
|
||||||
|
}
|
||||||
|
event = event.originalEvent;
|
||||||
|
if (event.clientX == null || event.clientY == null) {
|
||||||
|
throw new Error("The original event has no coordinates.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Copied from jQuery.event.fix() in jQuery 1.4.1.
|
||||||
|
// In newer jQuery versions, this code is in jQuery.event.mouseHooks.filter().
|
||||||
|
var doc = document.documentElement, body = document.body;
|
||||||
|
var pageX = event.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
|
||||||
|
var pageY = event.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 );
|
||||||
|
|
||||||
|
return {x: pageX, y: pageY};
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
79
misc/typo3/drupal-security/PharExtensionInterceptor.php
Normal file
79
misc/typo3/drupal-security/PharExtensionInterceptor.php
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Drupal\Core\Security;
|
||||||
|
|
||||||
|
use TYPO3\PharStreamWrapper\Assertable;
|
||||||
|
use TYPO3\PharStreamWrapper\Helper;
|
||||||
|
use TYPO3\PharStreamWrapper\Exception;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An alternate PharExtensionInterceptor to support phar-based CLI tools.
|
||||||
|
*
|
||||||
|
* @see \TYPO3\PharStreamWrapper\Interceptor\PharExtensionInterceptor
|
||||||
|
*/
|
||||||
|
class PharExtensionInterceptor implements Assertable {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines whether phar file is allowed to execute.
|
||||||
|
*
|
||||||
|
* The phar file is allowed to execute if:
|
||||||
|
* - the base file name has a ".phar" suffix.
|
||||||
|
* - it is the CLI tool that has invoked the interceptor.
|
||||||
|
*
|
||||||
|
* @param string $path
|
||||||
|
* The path of the phar file to check.
|
||||||
|
* @param string $command
|
||||||
|
* The command being carried out.
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
* TRUE if the phar file is allowed to execute.
|
||||||
|
*
|
||||||
|
* @throws Exception
|
||||||
|
* Thrown when the file is not allowed to execute.
|
||||||
|
*/
|
||||||
|
public function assert($path, $command) {
|
||||||
|
if ($this->baseFileContainsPharExtension($path)) {
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
throw new Exception(
|
||||||
|
sprintf(
|
||||||
|
'Unexpected file extension in "%s"',
|
||||||
|
$path
|
||||||
|
),
|
||||||
|
1535198703
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines if a path has a .phar extension or invoked execution.
|
||||||
|
*
|
||||||
|
* @param string $path
|
||||||
|
* The path of the phar file to check.
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
* TRUE if the file has a .phar extension or if the execution has been
|
||||||
|
* invoked by the phar file.
|
||||||
|
*/
|
||||||
|
private function baseFileContainsPharExtension($path) {
|
||||||
|
$baseFile = Helper::determineBaseFile($path);
|
||||||
|
if ($baseFile === NULL) {
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
// If the stream wrapper is registered by invoking a phar file that does
|
||||||
|
// 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);
|
||||||
|
// 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);
|
||||||
|
return strtolower($fileExtension) === 'phar';
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
21
misc/typo3/phar-stream-wrapper/LICENSE
Normal file
21
misc/typo3/phar-stream-wrapper/LICENSE
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2018 TYPO3 project - https://typo3.org/
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
155
misc/typo3/phar-stream-wrapper/README.md
Normal file
155
misc/typo3/phar-stream-wrapper/README.md
Normal file
@@ -0,0 +1,155 @@
|
|||||||
|
[](https://scrutinizer-ci.com/g/TYPO3/phar-stream-wrapper/?branch=v2)
|
||||||
|
[](https://travis-ci.org/TYPO3/phar-stream-wrapper)
|
||||||
|
|
||||||
|
# PHP Phar Stream Wrapper
|
||||||
|
|
||||||
|
## Abstract & History
|
||||||
|
|
||||||
|
Based on Sam Thomas' findings concerning
|
||||||
|
[insecure deserialization in combination with obfuscation strategies](https://blog.secarma.co.uk/labs/near-phar-dangerous-unserialization-wherever-you-are)
|
||||||
|
allowing to hide Phar files inside valid image resources, the TYPO3 project
|
||||||
|
decided back then to introduce a `PharStreamWrapper` to intercept invocations
|
||||||
|
of the `phar://` stream in PHP and only allow usage for defined locations in
|
||||||
|
the file system.
|
||||||
|
|
||||||
|
Since the TYPO3 mission statement is **inspiring people to share**, we thought
|
||||||
|
it would be helpful for others to release our `PharStreamWrapper` as standalone
|
||||||
|
package to the PHP community.
|
||||||
|
|
||||||
|
The mentioned security issue was reported to TYPO3 on 10th June 2018 by Sam Thomas
|
||||||
|
and has been addressed concerning the specific attack vector and for this generic
|
||||||
|
`PharStreamWrapper` in TYPO3 versions 7.6.30 LTS, 8.7.17 LTS and 9.3.1 on 12th
|
||||||
|
July 2018.
|
||||||
|
|
||||||
|
* https://typo3.org/security/advisory/typo3-core-sa-2018-002/
|
||||||
|
* https://blog.secarma.co.uk/labs/near-phar-dangerous-unserialization-wherever-you-are
|
||||||
|
* https://youtu.be/GePBmsNJw6Y
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
In general the TYPO3 core is released under the GNU General Public License version
|
||||||
|
2 or any later version (`GPL-2.0-or-later`). In order to avoid licensing issues and
|
||||||
|
incompatibilities this `PharStreamWrapper` is licenced under the MIT License. In case
|
||||||
|
you duplicate or modify source code, credits are not required but really appreciated.
|
||||||
|
|
||||||
|
## Credits
|
||||||
|
|
||||||
|
Thanks to [Alex Pott](https://github.com/alexpott), Drupal for creating
|
||||||
|
back-ports of all sources in order to provide compatibility with PHP v5.3.
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
The `PharStreamWrapper` is provided as composer package `typo3/phar-stream-wrapper`
|
||||||
|
and has minimum requirements of PHP v5.3 ([`v2`](https://github.com/TYPO3/phar-stream-wrapper/tree/v2) branch) and PHP v7.0 ([`master`](https://github.com/TYPO3/phar-stream-wrapper) branch).
|
||||||
|
|
||||||
|
### Installation for PHP v7.0
|
||||||
|
|
||||||
|
```
|
||||||
|
composer require typo3/phar-stream-wrapper ^3.0
|
||||||
|
```
|
||||||
|
|
||||||
|
### Installation for PHP v5.3
|
||||||
|
|
||||||
|
```
|
||||||
|
composer require typo3/phar-stream-wrapper ^2.0
|
||||||
|
```
|
||||||
|
|
||||||
|
## Example
|
||||||
|
|
||||||
|
The following example is bundled within this package, the shown
|
||||||
|
`PharExtensionInterceptor` denies all stream wrapper invocations files
|
||||||
|
not having the `.phar` suffix. Interceptor logic has to be individual and
|
||||||
|
adjusted to according requirements.
|
||||||
|
|
||||||
|
```
|
||||||
|
$behavior = new \TYPO3\PharStreamWrapper\Behavior();
|
||||||
|
Manager::initialize(
|
||||||
|
$behavior->withAssertion(new PharExtensionInterceptor())
|
||||||
|
);
|
||||||
|
|
||||||
|
if (in_array('phar', stream_get_wrappers())) {
|
||||||
|
stream_wrapper_unregister('phar');
|
||||||
|
stream_wrapper_register('phar', 'TYPO3\\PharStreamWrapper\\PharStreamWrapper');
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
* `PharStreamWrapper` defined as class reference will be instantiated each time
|
||||||
|
`phar://` streams shall be processed.
|
||||||
|
* `Manager` as singleton pattern being called by `PharStreamWrapper` instances
|
||||||
|
in order to retrieve individual behavior and settings.
|
||||||
|
* `Behavior` holds reference to interceptor(s) that shall assert correct/allowed
|
||||||
|
invocation of a given `$path` for a given `$command`. Interceptors implement
|
||||||
|
the interface `Assertable`. Interceptors can act individually on following
|
||||||
|
commands or handle all of them in case not defined specifically:
|
||||||
|
+ `COMMAND_DIR_OPENDIR`
|
||||||
|
+ `COMMAND_MKDIR`
|
||||||
|
+ `COMMAND_RENAME`
|
||||||
|
+ `COMMAND_RMDIR`
|
||||||
|
+ `COMMAND_STEAM_METADATA`
|
||||||
|
+ `COMMAND_STREAM_OPEN`
|
||||||
|
+ `COMMAND_UNLINK`
|
||||||
|
+ `COMMAND_URL_STAT`
|
||||||
|
|
||||||
|
## Interceptor
|
||||||
|
|
||||||
|
The following interceptor is shipped with the package and ready to use in order
|
||||||
|
to block any Phar invocation of files not having a `.phar` suffix. Besides that
|
||||||
|
individual interceptors are possible of course.
|
||||||
|
|
||||||
|
```
|
||||||
|
class PharExtensionInterceptor implements Assertable
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Determines whether the base file name has a ".phar" suffix.
|
||||||
|
*
|
||||||
|
* @param string $path
|
||||||
|
* @param string $command
|
||||||
|
* @return bool
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
public function assert($path, $command)
|
||||||
|
{
|
||||||
|
if ($this->baseFileContainsPharExtension($path)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
throw new Exception(
|
||||||
|
sprintf(
|
||||||
|
'Unexpected file extension in "%s"',
|
||||||
|
$path
|
||||||
|
),
|
||||||
|
1535198703
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
private function baseFileContainsPharExtension($path)
|
||||||
|
{
|
||||||
|
$baseFile = Helper::determineBaseFile($path);
|
||||||
|
if ($baseFile === null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
$fileExtension = pathinfo($baseFile, PATHINFO_EXTENSION);
|
||||||
|
return strtolower($fileExtension) === 'phar';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Helper
|
||||||
|
|
||||||
|
* `Helper::determineBaseFile(string $path)`: Determines base file that can be
|
||||||
|
accessed using the regular file system. For instance the following path
|
||||||
|
`phar:///home/user/bundle.phar/content.txt` would be resolved to
|
||||||
|
`/home/user/bundle.phar`.
|
||||||
|
* `Helper::resetOpCache()`: Resets PHP's OPcache if enabled as work-around for
|
||||||
|
issues in `include()` or `require()` calls and OPcache delivering wrong
|
||||||
|
results. More details can be found in PHP's bug tracker, for instance like
|
||||||
|
https://bugs.php.net/bug.php?id=66569
|
||||||
|
|
||||||
|
## Security Contact
|
||||||
|
|
||||||
|
In case of finding additional security issues in the TYPO3 project or in this
|
||||||
|
`PharStreamWrapper` package in particular, please get in touch with the
|
||||||
|
[TYPO3 Security Team](mailto:security@typo3.org).
|
||||||
24
misc/typo3/phar-stream-wrapper/composer.json
Normal file
24
misc/typo3/phar-stream-wrapper/composer.json
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
{
|
||||||
|
"name": "typo3/phar-stream-wrapper",
|
||||||
|
"description": "Interceptors for PHP's native phar:// stream handling",
|
||||||
|
"type": "library",
|
||||||
|
"license": "MIT",
|
||||||
|
"homepage": "https://typo3.org/",
|
||||||
|
"keywords": ["php", "phar", "stream-wrapper", "security"],
|
||||||
|
"require": {
|
||||||
|
"php": "^5.3.3|^7.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "^4.8.36"
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"TYPO3\\PharStreamWrapper\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload-dev": {
|
||||||
|
"psr-4": {
|
||||||
|
"TYPO3\\PharStreamWrapper\\Tests\\": "tests/"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
22
misc/typo3/phar-stream-wrapper/src/Assertable.php
Normal file
22
misc/typo3/phar-stream-wrapper/src/Assertable.php
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
namespace TYPO3\PharStreamWrapper;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the TYPO3 project.
|
||||||
|
*
|
||||||
|
* It is free software; you can redistribute it and/or modify it under the terms
|
||||||
|
* of the MIT License (MIT). For the full copyright and license information,
|
||||||
|
* please read the LICENSE file that was distributed with this source code.
|
||||||
|
*
|
||||||
|
* The TYPO3 project - inspiring people to share!
|
||||||
|
*/
|
||||||
|
|
||||||
|
interface Assertable
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @param string $command
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function assert($path, $command);
|
||||||
|
}
|
||||||
124
misc/typo3/phar-stream-wrapper/src/Behavior.php
Normal file
124
misc/typo3/phar-stream-wrapper/src/Behavior.php
Normal file
@@ -0,0 +1,124 @@
|
|||||||
|
<?php
|
||||||
|
namespace TYPO3\PharStreamWrapper;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the TYPO3 project.
|
||||||
|
*
|
||||||
|
* It is free software; you can redistribute it and/or modify it under the terms
|
||||||
|
* of the MIT License (MIT). For the full copyright and license information,
|
||||||
|
* please read the LICENSE file that was distributed with this source code.
|
||||||
|
*
|
||||||
|
* The TYPO3 project - inspiring people to share!
|
||||||
|
*/
|
||||||
|
|
||||||
|
class Behavior implements Assertable
|
||||||
|
{
|
||||||
|
const COMMAND_DIR_OPENDIR = 'dir_opendir';
|
||||||
|
const COMMAND_MKDIR = 'mkdir';
|
||||||
|
const COMMAND_RENAME = 'rename';
|
||||||
|
const COMMAND_RMDIR = 'rmdir';
|
||||||
|
const COMMAND_STEAM_METADATA = 'stream_metadata';
|
||||||
|
const COMMAND_STREAM_OPEN = 'stream_open';
|
||||||
|
const COMMAND_UNLINK = 'unlink';
|
||||||
|
const COMMAND_URL_STAT = 'url_stat';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string[]
|
||||||
|
*/
|
||||||
|
private $availableCommands = array(
|
||||||
|
self::COMMAND_DIR_OPENDIR,
|
||||||
|
self::COMMAND_MKDIR,
|
||||||
|
self::COMMAND_RENAME,
|
||||||
|
self::COMMAND_RMDIR,
|
||||||
|
self::COMMAND_STEAM_METADATA,
|
||||||
|
self::COMMAND_STREAM_OPEN,
|
||||||
|
self::COMMAND_UNLINK,
|
||||||
|
self::COMMAND_URL_STAT,
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Assertable[]
|
||||||
|
*/
|
||||||
|
private $assertions;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Assertable $assertable
|
||||||
|
* @return static
|
||||||
|
*/
|
||||||
|
public function withAssertion(Assertable $assertable)
|
||||||
|
{
|
||||||
|
$commands = func_get_args();
|
||||||
|
array_shift($commands);
|
||||||
|
$this->assertCommands($commands);
|
||||||
|
$commands = $commands ?: $this->availableCommands;
|
||||||
|
|
||||||
|
$target = clone $this;
|
||||||
|
foreach ($commands as $command) {
|
||||||
|
$target->assertions[$command] = $assertable;
|
||||||
|
}
|
||||||
|
return $target;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @param string $command
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function assert($path, $command)
|
||||||
|
{
|
||||||
|
$this->assertCommand($command);
|
||||||
|
$this->assertAssertionCompleteness();
|
||||||
|
|
||||||
|
return $this->assertions[$command]->assert($path, $command);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array $commands
|
||||||
|
*/
|
||||||
|
private function assertCommands(array $commands)
|
||||||
|
{
|
||||||
|
$unknownCommands = array_diff($commands, $this->availableCommands);
|
||||||
|
if (empty($unknownCommands)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
throw new \LogicException(
|
||||||
|
sprintf(
|
||||||
|
'Unknown commands: %s',
|
||||||
|
implode(', ', $unknownCommands)
|
||||||
|
),
|
||||||
|
1535189881
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function assertCommand($command)
|
||||||
|
{
|
||||||
|
if (in_array($command, $this->availableCommands, true)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
throw new \LogicException(
|
||||||
|
sprintf(
|
||||||
|
'Unknown command "%s"',
|
||||||
|
$command
|
||||||
|
),
|
||||||
|
1535189882
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function assertAssertionCompleteness()
|
||||||
|
{
|
||||||
|
$undefinedAssertions = array_diff(
|
||||||
|
$this->availableCommands,
|
||||||
|
array_keys($this->assertions)
|
||||||
|
);
|
||||||
|
if (empty($undefinedAssertions)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
throw new \LogicException(
|
||||||
|
sprintf(
|
||||||
|
'Missing assertions for commands: %s',
|
||||||
|
implode(', ', $undefinedAssertions)
|
||||||
|
),
|
||||||
|
1535189883
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
16
misc/typo3/phar-stream-wrapper/src/Exception.php
Normal file
16
misc/typo3/phar-stream-wrapper/src/Exception.php
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
<?php
|
||||||
|
namespace TYPO3\PharStreamWrapper;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the TYPO3 project.
|
||||||
|
*
|
||||||
|
* It is free software; you can redistribute it and/or modify it under the terms
|
||||||
|
* of the MIT License (MIT). For the full copyright and license information,
|
||||||
|
* please read the LICENSE file that was distributed with this source code.
|
||||||
|
*
|
||||||
|
* The TYPO3 project - inspiring people to share!
|
||||||
|
*/
|
||||||
|
|
||||||
|
class Exception extends \RuntimeException
|
||||||
|
{
|
||||||
|
}
|
||||||
183
misc/typo3/phar-stream-wrapper/src/Helper.php
Normal file
183
misc/typo3/phar-stream-wrapper/src/Helper.php
Normal file
@@ -0,0 +1,183 @@
|
|||||||
|
<?php
|
||||||
|
namespace TYPO3\PharStreamWrapper;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the TYPO3 project.
|
||||||
|
*
|
||||||
|
* It is free software; you can redistribute it and/or modify it under the terms
|
||||||
|
* of the MIT License (MIT). For the full copyright and license information,
|
||||||
|
* please read the LICENSE file that was distributed with this source code.
|
||||||
|
*
|
||||||
|
* The TYPO3 project - inspiring people to share!
|
||||||
|
*/
|
||||||
|
|
||||||
|
class Helper
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Resets PHP's OPcache if enabled as work-around for issues in `include()`
|
||||||
|
* or `require()` calls and OPcache delivering wrong results.
|
||||||
|
*
|
||||||
|
* @see https://bugs.php.net/bug.php?id=66569
|
||||||
|
*/
|
||||||
|
public static function resetOpCache()
|
||||||
|
{
|
||||||
|
if (function_exists('opcache_reset')
|
||||||
|
&& function_exists('opcache_get_status')
|
||||||
|
) {
|
||||||
|
$status = opcache_get_status();
|
||||||
|
if (!empty($status['opcache_enabled'])) {
|
||||||
|
opcache_reset();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines base file that can be accessed using the regular file system.
|
||||||
|
* For e.g. "phar:///home/user/bundle.phar/content.txt" that would result
|
||||||
|
* into "/home/user/bundle.phar".
|
||||||
|
*
|
||||||
|
* @param string $path
|
||||||
|
* @return string|null
|
||||||
|
*/
|
||||||
|
public static function determineBaseFile($path)
|
||||||
|
{
|
||||||
|
$parts = explode('/', static::normalizePath($path));
|
||||||
|
|
||||||
|
while (count($parts)) {
|
||||||
|
$currentPath = implode('/', $parts);
|
||||||
|
if (@is_file($currentPath)) {
|
||||||
|
return $currentPath;
|
||||||
|
}
|
||||||
|
array_pop($parts);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public static function removePharPrefix($path)
|
||||||
|
{
|
||||||
|
$path = trim($path);
|
||||||
|
if (stripos($path, 'phar://') !== 0) {
|
||||||
|
return $path;
|
||||||
|
}
|
||||||
|
return substr($path, 7);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Normalizes a path, removes phar:// prefix, fixes Windows directory
|
||||||
|
* separators. Result is without trailing slash.
|
||||||
|
*
|
||||||
|
* @param string $path
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public static function normalizePath($path)
|
||||||
|
{
|
||||||
|
return rtrim(
|
||||||
|
static::getCanonicalPath(
|
||||||
|
static::removePharPrefix($path)
|
||||||
|
),
|
||||||
|
'/'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fixes a path for windows-backslashes and reduces double-slashes to single slashes
|
||||||
|
*
|
||||||
|
* @param string $path File path to process
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
private static function normalizeWindowsPath($path)
|
||||||
|
{
|
||||||
|
return str_replace('\\', '/', $path);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolves all dots, slashes and removes spaces after or before a path...
|
||||||
|
*
|
||||||
|
* @param string $path Input string
|
||||||
|
* @return string Canonical path, always without trailing slash
|
||||||
|
*/
|
||||||
|
private static function getCanonicalPath($path)
|
||||||
|
{
|
||||||
|
$path = static::normalizeWindowsPath($path);
|
||||||
|
|
||||||
|
$absolutePathPrefix = '';
|
||||||
|
if (static::isAbsolutePath($path)) {
|
||||||
|
if (static::isWindows() && strpos($path, ':/') === 1) {
|
||||||
|
$absolutePathPrefix = substr($path, 0, 3);
|
||||||
|
$path = substr($path, 3);
|
||||||
|
} else {
|
||||||
|
$path = ltrim($path, '/');
|
||||||
|
$absolutePathPrefix = '/';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$pathParts = explode('/', $path);
|
||||||
|
$pathPartsLength = count($pathParts);
|
||||||
|
for ($partCount = 0; $partCount < $pathPartsLength; $partCount++) {
|
||||||
|
// double-slashes in path: remove element
|
||||||
|
if ($pathParts[$partCount] === '') {
|
||||||
|
array_splice($pathParts, $partCount, 1);
|
||||||
|
$partCount--;
|
||||||
|
$pathPartsLength--;
|
||||||
|
}
|
||||||
|
// "." in path: remove element
|
||||||
|
if ((isset($pathParts[$partCount]) ? $pathParts[$partCount] : '') === '.') {
|
||||||
|
array_splice($pathParts, $partCount, 1);
|
||||||
|
$partCount--;
|
||||||
|
$pathPartsLength--;
|
||||||
|
}
|
||||||
|
// ".." in path:
|
||||||
|
if ((isset($pathParts[$partCount]) ? $pathParts[$partCount] : '') === '..') {
|
||||||
|
if ($partCount === 0) {
|
||||||
|
array_splice($pathParts, $partCount, 1);
|
||||||
|
$partCount--;
|
||||||
|
$pathPartsLength--;
|
||||||
|
} elseif ($partCount >= 1) {
|
||||||
|
// Rremove this and previous element
|
||||||
|
array_splice($pathParts, $partCount - 1, 2);
|
||||||
|
$partCount -= 2;
|
||||||
|
$pathPartsLength -= 2;
|
||||||
|
} elseif ($absolutePathPrefix) {
|
||||||
|
// can't go higher than root dir
|
||||||
|
// simply remove this part and continue
|
||||||
|
array_splice($pathParts, $partCount, 1);
|
||||||
|
$partCount--;
|
||||||
|
$pathPartsLength--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $absolutePathPrefix . implode('/', $pathParts);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the $path is absolute or relative (detecting either '/' or
|
||||||
|
* 'x:/' as first part of string) and returns TRUE if so.
|
||||||
|
*
|
||||||
|
* @param string $path File path to evaluate
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
private static function isAbsolutePath($path)
|
||||||
|
{
|
||||||
|
// Path starting with a / is always absolute, on every system
|
||||||
|
// On Windows also a path starting with a drive letter is absolute: X:/
|
||||||
|
return (isset($path[0]) ? $path[0] : null) === '/'
|
||||||
|
|| static::isWindows() && (
|
||||||
|
strpos($path, ':/') === 1
|
||||||
|
|| strpos($path, ':\\') === 1
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
private static function isWindows()
|
||||||
|
{
|
||||||
|
return stripos(PHP_OS, 'WIN') === 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
<?php
|
||||||
|
namespace TYPO3\PharStreamWrapper\Interceptor;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the TYPO3 project.
|
||||||
|
*
|
||||||
|
* It is free software; you can redistribute it and/or modify it under the terms
|
||||||
|
* of the MIT License (MIT). For the full copyright and license information,
|
||||||
|
* please read the LICENSE file that was distributed with this source code.
|
||||||
|
*
|
||||||
|
* The TYPO3 project - inspiring people to share!
|
||||||
|
*/
|
||||||
|
|
||||||
|
use TYPO3\PharStreamWrapper\Assertable;
|
||||||
|
use TYPO3\PharStreamWrapper\Helper;
|
||||||
|
use TYPO3\PharStreamWrapper\Exception;
|
||||||
|
|
||||||
|
class PharExtensionInterceptor implements Assertable
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Determines whether the base file name has a ".phar" suffix.
|
||||||
|
*
|
||||||
|
* @param string $path
|
||||||
|
* @param string $command
|
||||||
|
* @return bool
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
public function assert($path, $command)
|
||||||
|
{
|
||||||
|
if ($this->baseFileContainsPharExtension($path)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
throw new Exception(
|
||||||
|
sprintf(
|
||||||
|
'Unexpected file extension in "%s"',
|
||||||
|
$path
|
||||||
|
),
|
||||||
|
1535198703
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
private function baseFileContainsPharExtension($path)
|
||||||
|
{
|
||||||
|
$baseFile = Helper::determineBaseFile($path);
|
||||||
|
if ($baseFile === null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
$fileExtension = pathinfo($baseFile, PATHINFO_EXTENSION);
|
||||||
|
return strtolower($fileExtension) === 'phar';
|
||||||
|
}
|
||||||
|
}
|
||||||
85
misc/typo3/phar-stream-wrapper/src/Manager.php
Normal file
85
misc/typo3/phar-stream-wrapper/src/Manager.php
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
<?php
|
||||||
|
namespace TYPO3\PharStreamWrapper;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the TYPO3 project.
|
||||||
|
*
|
||||||
|
* It is free software; you can redistribute it and/or modify it under the terms
|
||||||
|
* of the MIT License (MIT). For the full copyright and license information,
|
||||||
|
* please read the LICENSE file that was distributed with this source code.
|
||||||
|
*
|
||||||
|
* The TYPO3 project - inspiring people to share!
|
||||||
|
*/
|
||||||
|
|
||||||
|
class Manager implements Assertable
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var self
|
||||||
|
*/
|
||||||
|
private static $instance;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Behavior
|
||||||
|
*/
|
||||||
|
private $behavior;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Behavior $behaviour
|
||||||
|
* @return self
|
||||||
|
*/
|
||||||
|
public static function initialize(Behavior $behaviour)
|
||||||
|
{
|
||||||
|
if (self::$instance === null) {
|
||||||
|
self::$instance = new self($behaviour);
|
||||||
|
return self::$instance;
|
||||||
|
}
|
||||||
|
throw new \LogicException(
|
||||||
|
'Manager can only be initialized once',
|
||||||
|
1535189871
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return self
|
||||||
|
*/
|
||||||
|
public static function instance()
|
||||||
|
{
|
||||||
|
if (self::$instance !== null) {
|
||||||
|
return self::$instance;
|
||||||
|
}
|
||||||
|
throw new \LogicException(
|
||||||
|
'Manager needs to be initialized first',
|
||||||
|
1535189872
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public static function destroy()
|
||||||
|
{
|
||||||
|
if (self::$instance === null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
self::$instance = null;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Behavior $behaviour
|
||||||
|
*/
|
||||||
|
private function __construct(Behavior $behaviour)
|
||||||
|
{
|
||||||
|
$this->behavior = $behaviour;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @param string $command
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function assert($path, $command)
|
||||||
|
{
|
||||||
|
return $this->behavior->assert($path, $command);
|
||||||
|
}
|
||||||
|
}
|
||||||
477
misc/typo3/phar-stream-wrapper/src/PharStreamWrapper.php
Normal file
477
misc/typo3/phar-stream-wrapper/src/PharStreamWrapper.php
Normal file
@@ -0,0 +1,477 @@
|
|||||||
|
<?php
|
||||||
|
namespace TYPO3\PharStreamWrapper;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the TYPO3 project.
|
||||||
|
*
|
||||||
|
* It is free software; you can redistribute it and/or modify it under the terms
|
||||||
|
* of the MIT License (MIT). For the full copyright and license information,
|
||||||
|
* please read the LICENSE file that was distributed with this source code.
|
||||||
|
*
|
||||||
|
* The TYPO3 project - inspiring people to share!
|
||||||
|
*/
|
||||||
|
|
||||||
|
class PharStreamWrapper
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Internal stream constants that are not exposed to PHP, but used...
|
||||||
|
* @see https://github.com/php/php-src/blob/e17fc0d73c611ad0207cac8a4a01ded38251a7dc/main/php_streams.h
|
||||||
|
*/
|
||||||
|
const STREAM_OPEN_FOR_INCLUDE = 128;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var resource
|
||||||
|
*/
|
||||||
|
public $context;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var resource
|
||||||
|
*/
|
||||||
|
protected $internalResource;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function dir_closedir()
|
||||||
|
{
|
||||||
|
if (!is_resource($this->internalResource)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->invokeInternalStreamWrapper(
|
||||||
|
'closedir',
|
||||||
|
$this->internalResource
|
||||||
|
);
|
||||||
|
return !is_resource($this->internalResource);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @param int $options
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function dir_opendir($path, $options)
|
||||||
|
{
|
||||||
|
$this->assert($path, Behavior::COMMAND_DIR_OPENDIR);
|
||||||
|
$this->internalResource = $this->invokeInternalStreamWrapper(
|
||||||
|
'opendir',
|
||||||
|
$path,
|
||||||
|
$this->context
|
||||||
|
);
|
||||||
|
return is_resource($this->internalResource);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string|false
|
||||||
|
*/
|
||||||
|
public function dir_readdir()
|
||||||
|
{
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'readdir',
|
||||||
|
$this->internalResource
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function dir_rewinddir()
|
||||||
|
{
|
||||||
|
if (!is_resource($this->internalResource)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->invokeInternalStreamWrapper(
|
||||||
|
'rewinddir',
|
||||||
|
$this->internalResource
|
||||||
|
);
|
||||||
|
return is_resource($this->internalResource);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @param int $mode
|
||||||
|
* @param int $options
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function mkdir($path, $mode, $options)
|
||||||
|
{
|
||||||
|
$this->assert($path, Behavior::COMMAND_MKDIR);
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'mkdir',
|
||||||
|
$path,
|
||||||
|
$mode,
|
||||||
|
(bool) ($options & STREAM_MKDIR_RECURSIVE),
|
||||||
|
$this->context
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path_from
|
||||||
|
* @param string $path_to
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function rename($path_from, $path_to)
|
||||||
|
{
|
||||||
|
$this->assert($path_from, Behavior::COMMAND_RENAME);
|
||||||
|
$this->assert($path_to, Behavior::COMMAND_RENAME);
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'rename',
|
||||||
|
$path_from,
|
||||||
|
$path_to,
|
||||||
|
$this->context
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @param int $options
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function rmdir($path, $options)
|
||||||
|
{
|
||||||
|
$this->assert($path, Behavior::COMMAND_RMDIR);
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'rmdir',
|
||||||
|
$path,
|
||||||
|
$this->context
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param int $cast_as
|
||||||
|
*/
|
||||||
|
public function stream_cast($cast_as)
|
||||||
|
{
|
||||||
|
throw new Exception(
|
||||||
|
'Method stream_select() cannot be used',
|
||||||
|
1530103999
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function stream_close()
|
||||||
|
{
|
||||||
|
$this->invokeInternalStreamWrapper(
|
||||||
|
'fclose',
|
||||||
|
$this->internalResource
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function stream_eof()
|
||||||
|
{
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'feof',
|
||||||
|
$this->internalResource
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function stream_flush()
|
||||||
|
{
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'fflush',
|
||||||
|
$this->internalResource
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param int $operation
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function stream_lock($operation)
|
||||||
|
{
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'flock',
|
||||||
|
$this->internalResource,
|
||||||
|
$operation
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @param int $option
|
||||||
|
* @param string|int $value
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function stream_metadata($path, $option, $value)
|
||||||
|
{
|
||||||
|
$this->assert($path, Behavior::COMMAND_STEAM_METADATA);
|
||||||
|
if ($option === STREAM_META_TOUCH) {
|
||||||
|
return call_user_func_array(
|
||||||
|
array($this, 'invokeInternalStreamWrapper'),
|
||||||
|
array_merge(array('touch', $path), (array) $value)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if ($option === STREAM_META_OWNER_NAME || $option === STREAM_META_OWNER) {
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'chown',
|
||||||
|
$path,
|
||||||
|
$value
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if ($option === STREAM_META_GROUP_NAME || $option === STREAM_META_GROUP) {
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'chgrp',
|
||||||
|
$path,
|
||||||
|
$value
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if ($option === STREAM_META_ACCESS) {
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'chmod',
|
||||||
|
$path,
|
||||||
|
$value
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @param string $mode
|
||||||
|
* @param int $options
|
||||||
|
* @param string|null $opened_path
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function stream_open(
|
||||||
|
$path,
|
||||||
|
$mode,
|
||||||
|
$options,
|
||||||
|
&$opened_path = null
|
||||||
|
) {
|
||||||
|
$this->assert($path, Behavior::COMMAND_STREAM_OPEN);
|
||||||
|
$arguments = array($path, $mode, (bool) ($options & STREAM_USE_PATH));
|
||||||
|
// only add stream context for non include/require calls
|
||||||
|
if (!($options & static::STREAM_OPEN_FOR_INCLUDE)) {
|
||||||
|
$arguments[] = $this->context;
|
||||||
|
// work around https://bugs.php.net/bug.php?id=66569
|
||||||
|
// for including files from Phar stream with OPcache enabled
|
||||||
|
} else {
|
||||||
|
Helper::resetOpCache();
|
||||||
|
}
|
||||||
|
$this->internalResource = call_user_func_array(
|
||||||
|
array($this, 'invokeInternalStreamWrapper'),
|
||||||
|
array_merge(array('fopen'), $arguments)
|
||||||
|
);
|
||||||
|
if (!is_resource($this->internalResource)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if ($opened_path !== null) {
|
||||||
|
$metaData = stream_get_meta_data($this->internalResource);
|
||||||
|
$opened_path = $metaData['uri'];
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param int $count
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function stream_read($count)
|
||||||
|
{
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'fread',
|
||||||
|
$this->internalResource,
|
||||||
|
$count
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param int $offset
|
||||||
|
* @param int $whence
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function stream_seek($offset, $whence = SEEK_SET)
|
||||||
|
{
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'fseek',
|
||||||
|
$this->internalResource,
|
||||||
|
$offset,
|
||||||
|
$whence
|
||||||
|
) !== -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param int $option
|
||||||
|
* @param int $arg1
|
||||||
|
* @param int $arg2
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function stream_set_option($option, $arg1, $arg2)
|
||||||
|
{
|
||||||
|
if ($option === STREAM_OPTION_BLOCKING) {
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'stream_set_blocking',
|
||||||
|
$this->internalResource,
|
||||||
|
$arg1
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if ($option === STREAM_OPTION_READ_TIMEOUT) {
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'stream_set_timeout',
|
||||||
|
$this->internalResource,
|
||||||
|
$arg1,
|
||||||
|
$arg2
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if ($option === STREAM_OPTION_WRITE_BUFFER) {
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'stream_set_write_buffer',
|
||||||
|
$this->internalResource,
|
||||||
|
$arg2
|
||||||
|
) === 0;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function stream_stat()
|
||||||
|
{
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'fstat',
|
||||||
|
$this->internalResource
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function stream_tell()
|
||||||
|
{
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'ftell',
|
||||||
|
$this->internalResource
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param int $new_size
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function stream_truncate($new_size)
|
||||||
|
{
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'ftruncate',
|
||||||
|
$this->internalResource,
|
||||||
|
$new_size
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $data
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function stream_write($data)
|
||||||
|
{
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'fwrite',
|
||||||
|
$this->internalResource,
|
||||||
|
$data
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function unlink($path)
|
||||||
|
{
|
||||||
|
$this->assert($path, Behavior::COMMAND_UNLINK);
|
||||||
|
return $this->invokeInternalStreamWrapper(
|
||||||
|
'unlink',
|
||||||
|
$path,
|
||||||
|
$this->context
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @param int $flags
|
||||||
|
* @return array|false
|
||||||
|
*/
|
||||||
|
public function url_stat($path, $flags)
|
||||||
|
{
|
||||||
|
$this->assert($path, Behavior::COMMAND_URL_STAT);
|
||||||
|
$functionName = $flags & STREAM_URL_STAT_QUIET ? '@stat' : 'stat';
|
||||||
|
return $this->invokeInternalStreamWrapper($functionName, $path);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @param string $command
|
||||||
|
*/
|
||||||
|
protected function assert($path, $command)
|
||||||
|
{
|
||||||
|
if ($this->resolveAssertable()->assert($path, $command) === true) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Exception(
|
||||||
|
sprintf(
|
||||||
|
'Denied invocation of "%s" for command "%s"',
|
||||||
|
$path,
|
||||||
|
$command
|
||||||
|
),
|
||||||
|
1535189880
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Assertable
|
||||||
|
*/
|
||||||
|
protected function resolveAssertable()
|
||||||
|
{
|
||||||
|
return Manager::instance();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Invokes commands on the native PHP Phar stream wrapper.
|
||||||
|
*
|
||||||
|
* @param string $functionName
|
||||||
|
* @param mixed ...$arguments
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
private function invokeInternalStreamWrapper($functionName)
|
||||||
|
{
|
||||||
|
$arguments = func_get_args();
|
||||||
|
array_shift($arguments);
|
||||||
|
$silentExecution = $functionName{0} === '@';
|
||||||
|
$functionName = ltrim($functionName, '@');
|
||||||
|
$this->restoreInternalSteamWrapper();
|
||||||
|
|
||||||
|
try {
|
||||||
|
if ($silentExecution) {
|
||||||
|
$result = @call_user_func_array($functionName, $arguments);
|
||||||
|
} else {
|
||||||
|
$result = call_user_func_array($functionName, $arguments);
|
||||||
|
}
|
||||||
|
} catch (\Exception $exception) {
|
||||||
|
$this->registerStreamWrapper();
|
||||||
|
throw $exception;
|
||||||
|
} catch (\Throwable $throwable) {
|
||||||
|
$this->registerStreamWrapper();
|
||||||
|
throw $throwable;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->registerStreamWrapper();
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function restoreInternalSteamWrapper()
|
||||||
|
{
|
||||||
|
stream_wrapper_restore('phar');
|
||||||
|
}
|
||||||
|
|
||||||
|
private function registerStreamWrapper()
|
||||||
|
{
|
||||||
|
stream_wrapper_unregister('phar');
|
||||||
|
stream_wrapper_register('phar', get_class($this));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@ files[] = aggregator.test
|
|||||||
configure = admin/config/services/aggregator/settings
|
configure = admin/config/services/aggregator/settings
|
||||||
stylesheets[all][] = aggregator.css
|
stylesheets[all][] = aggregator.css
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
files[] = block.test
|
files[] = block.test
|
||||||
configure = admin/structure/block
|
configure = admin/structure/block
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ regions[footer] = Footer
|
|||||||
regions[highlighted] = Highlighted
|
regions[highlighted] = Highlighted
|
||||||
regions[help] = Help
|
regions[help] = Help
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
files[] = blog.test
|
files[] = blog.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ files[] = book.test
|
|||||||
configure = admin/content/book/settings
|
configure = admin/content/book/settings
|
||||||
stylesheets[all][] = book.css
|
stylesheets[all][] = book.css
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -768,11 +768,13 @@ function book_prev($book_link) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
$flat = book_get_flat_menu($book_link);
|
$flat = book_get_flat_menu($book_link);
|
||||||
// Assigning the array to $flat resets the array pointer for use with each().
|
reset($flat);
|
||||||
$curr = NULL;
|
$curr = NULL;
|
||||||
do {
|
do {
|
||||||
$prev = $curr;
|
$prev = $curr;
|
||||||
list($key, $curr) = each($flat);
|
$curr = current($flat);
|
||||||
|
$key = key($flat);
|
||||||
|
next($flat);
|
||||||
} while ($key && $key != $book_link['mlid']);
|
} while ($key && $key != $book_link['mlid']);
|
||||||
|
|
||||||
if ($key == $book_link['mlid']) {
|
if ($key == $book_link['mlid']) {
|
||||||
@@ -806,9 +808,10 @@ function book_prev($book_link) {
|
|||||||
*/
|
*/
|
||||||
function book_next($book_link) {
|
function book_next($book_link) {
|
||||||
$flat = book_get_flat_menu($book_link);
|
$flat = book_get_flat_menu($book_link);
|
||||||
// Assigning the array to $flat resets the array pointer for use with each().
|
reset($flat);
|
||||||
do {
|
do {
|
||||||
list($key, $curr) = each($flat);
|
$key = key($flat);
|
||||||
|
next($flat);
|
||||||
}
|
}
|
||||||
while ($key && $key != $book_link['mlid']);
|
while ($key && $key != $book_link['mlid']);
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
files[] = color.test
|
files[] = color.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ files[] = comment.test
|
|||||||
configure = admin/content/comment
|
configure = admin/content/comment
|
||||||
stylesheets[all][] = comment.css
|
stylesheets[all][] = comment.css
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
files[] = contact.test
|
files[] = contact.test
|
||||||
configure = admin/structure/contact
|
configure = admin/structure/contact
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
files[] = contextual.test
|
files[] = contextual.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ files[] = dashboard.test
|
|||||||
dependencies[] = block
|
dependencies[] = block
|
||||||
configure = admin/dashboard/customize
|
configure = admin/dashboard/customize
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
files[] = dblog.test
|
files[] = dblog.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ dependencies[] = field_sql_storage
|
|||||||
required = TRUE
|
required = TRUE
|
||||||
stylesheets[all][] = theme/field.css
|
stylesheets[all][] = theme/field.css
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ dependencies[] = field
|
|||||||
files[] = field_sql_storage.test
|
files[] = field_sql_storage.test
|
||||||
required = TRUE
|
required = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ dependencies[] = field
|
|||||||
dependencies[] = options
|
dependencies[] = options
|
||||||
files[] = tests/list.test
|
files[] = tests/list.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ function list_update_7001() {
|
|||||||
|
|
||||||
// Additionally, float keys need to be disambiguated ('.5' is '0.5').
|
// Additionally, float keys need to be disambiguated ('.5' is '0.5').
|
||||||
if ($field['type'] == 'list_number' && !empty($allowed_values)) {
|
if ($field['type'] == 'list_number' && !empty($allowed_values)) {
|
||||||
$keys = array_map(create_function('$a', 'return (string) (float) $a;'), array_keys($allowed_values));
|
$keys = array_map('_list_update_7001_float_string_cast', array_keys($allowed_values));
|
||||||
$allowed_values = array_combine($keys, array_values($allowed_values));
|
$allowed_values = array_combine($keys, array_values($allowed_values));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,6 +88,13 @@ function list_update_7001() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper callback function to cast the array element.
|
||||||
|
*/
|
||||||
|
function _list_update_7001_float_string_cast($element) {
|
||||||
|
return (string) (float) $element;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper function for list_update_7001: extract allowed values from a string.
|
* Helper function for list_update_7001: extract allowed values from a string.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ package = Testing
|
|||||||
version = VERSION
|
version = VERSION
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
dependencies[] = field
|
dependencies[] = field
|
||||||
files[] = number.test
|
files[] = number.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
dependencies[] = field
|
dependencies[] = field
|
||||||
files[] = options.test
|
files[] = options.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ dependencies[] = field
|
|||||||
files[] = text.test
|
files[] = text.test
|
||||||
required = TRUE
|
required = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ files[] = field_test.entity.inc
|
|||||||
version = VERSION
|
version = VERSION
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
dependencies[] = field
|
dependencies[] = field
|
||||||
files[] = field_ui.test
|
files[] = field_ui.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
dependencies[] = field
|
dependencies[] = field
|
||||||
files[] = tests/file.test
|
files[] = tests/file.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ files[] = filter.test
|
|||||||
required = TRUE
|
required = TRUE
|
||||||
configure = admin/config/content/formats
|
configure = admin/config/content/formats
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ files[] = forum.test
|
|||||||
configure = admin/structure/forum
|
configure = admin/structure/forum
|
||||||
stylesheets[all][] = forum.css
|
stylesheets[all][] = forum.css
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
files[] = help.test
|
files[] = help.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -736,7 +736,8 @@ function theme_image_style_effects($variables) {
|
|||||||
if (!isset($form[$key]['#access']) || $form[$key]['#access']) {
|
if (!isset($form[$key]['#access']) || $form[$key]['#access']) {
|
||||||
$rows[] = array(
|
$rows[] = array(
|
||||||
'data' => $row,
|
'data' => $row,
|
||||||
'class' => !empty($form[$key]['weight']['#access']) || $key == 'new' ? array('draggable') : array(),
|
// Use a strict (===) comparison since $key can be 0.
|
||||||
|
'class' => !empty($form[$key]['weight']['#access']) || $key === 'new' ? array('draggable') : array(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ dependencies[] = file
|
|||||||
files[] = image.test
|
files[] = image.test
|
||||||
configure = admin/config/media/image-styles
|
configure = admin/config/media/image-styles
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
files[] = image_module_test.module
|
files[] = image_module_test.module
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
files[] = locale.test
|
files[] = locale.test
|
||||||
configure = admin/config/regional/language
|
configure = admin/config/regional/language
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -3188,11 +3188,7 @@ class LocaleLanguageNegotiationInfoFunctionalTest extends DrupalWebTestCase {
|
|||||||
foreach (language_types_info() as $type => $info) {
|
foreach (language_types_info() as $type => $info) {
|
||||||
if (isset($info['fixed'])) {
|
if (isset($info['fixed'])) {
|
||||||
$negotiation = variable_get("language_negotiation_$type", array());
|
$negotiation = variable_get("language_negotiation_$type", array());
|
||||||
$equal = count($info['fixed']) == count($negotiation);
|
$equal = array_keys($negotiation) === array_values($info['fixed']);
|
||||||
while ($equal && list($id) = each($negotiation)) {
|
|
||||||
list(, $info_id) = each($info['fixed']);
|
|
||||||
$equal = $info_id == $id;
|
|
||||||
}
|
|
||||||
$this->assertTrue($equal, format_string('language negotiation for %type is properly set up', array('%type' => $type)));
|
$this->assertTrue($equal, format_string('language negotiation for %type is properly set up', array('%type' => $type)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ package = Testing
|
|||||||
version = VERSION
|
version = VERSION
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
files[] = menu.test
|
files[] = menu.test
|
||||||
configure = admin/structure/menu
|
configure = admin/structure/menu
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ required = TRUE
|
|||||||
configure = admin/structure/types
|
configure = admin/structure/types
|
||||||
stylesheets[all][] = node.css
|
stylesheets[all][] = node.css
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ package = Core
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
files[] = openid.test
|
files[] = openid.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
dependencies[] = openid
|
dependencies[] = openid
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ package = Core
|
|||||||
version = VERSION
|
version = VERSION
|
||||||
core = 7.x
|
core = 7.x
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
files[] = path.test
|
files[] = path.test
|
||||||
configure = admin/config/search/path
|
configure = admin/config/search/path
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
files[] = php.test
|
files[] = php.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
files[] = poll.test
|
files[] = poll.test
|
||||||
stylesheets[all][] = poll.css
|
stylesheets[all][] = poll.css
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ configure = admin/config/people/profile
|
|||||||
; See user_system_info_alter().
|
; See user_system_info_alter().
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
files[] = rdf.test
|
files[] = rdf.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
dependencies[] = blog
|
dependencies[] = blog
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ files[] = search.test
|
|||||||
configure = admin/config/search/settings
|
configure = admin/config/search/settings
|
||||||
stylesheets[all][] = search.css
|
stylesheets[all][] = search.css
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
files[] = shortcut.test
|
files[] = shortcut.test
|
||||||
configure = admin/config/user-interface/shortcut
|
configure = admin/config/user-interface/shortcut
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
BIN
modules/simpletest/files/phar-1.phar
Normal file
BIN
modules/simpletest/files/phar-1.phar
Normal file
Binary file not shown.
@@ -57,7 +57,7 @@ files[] = tests/upgrade/update.trigger.test
|
|||||||
files[] = tests/upgrade/update.field.test
|
files[] = tests/upgrade/update.field.test
|
||||||
files[] = tests/upgrade/update.user.test
|
files[] = tests/upgrade/update.user.test
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ package = Testing
|
|||||||
version = VERSION
|
version = VERSION
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ package = Testing
|
|||||||
version = VERSION
|
version = VERSION
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ package = Testing
|
|||||||
version = VERSION
|
version = VERSION
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ stylesheets[all][] = common_test.css
|
|||||||
stylesheets[print][] = common_test.print.css
|
stylesheets[print][] = common_test.print.css
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ package = Testing
|
|||||||
version = VERSION
|
version = VERSION
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
dependencies[] = entity_cache_test_dependency
|
dependencies[] = entity_cache_test_dependency
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ package = Testing
|
|||||||
version = VERSION
|
version = VERSION
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -2766,4 +2766,64 @@ class StreamWrapperTest extends DrupalWebTestCase {
|
|||||||
$this->assertTrue(file_stream_wrapper_valid_scheme(file_uri_scheme('public://asdf')), 'Got a valid stream scheme from public://asdf');
|
$this->assertTrue(file_stream_wrapper_valid_scheme(file_uri_scheme('public://asdf')), 'Got a valid stream scheme from public://asdf');
|
||||||
$this->assertFalse(file_stream_wrapper_valid_scheme(file_uri_scheme('foo://asdf')), 'Did not get a valid stream scheme from foo://asdf');
|
$this->assertFalse(file_stream_wrapper_valid_scheme(file_uri_scheme('foo://asdf')), 'Did not get a valid stream scheme from foo://asdf');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests that phar stream wrapper is registered as expected.
|
||||||
|
*
|
||||||
|
* @see file_get_stream_wrappers()
|
||||||
|
*/
|
||||||
|
public function testPharStreamWrapperRegistration() {
|
||||||
|
if (!class_exists('Phar', FALSE)) {
|
||||||
|
$this->assertFalse(in_array('phar', stream_get_wrappers(), TRUE), 'PHP is compiled without phar support. Therefore, no phar stream wrapper is registered.');
|
||||||
|
}
|
||||||
|
elseif (version_compare(PHP_VERSION, '5.3.3', '<')) {
|
||||||
|
$this->assertFalse(in_array('phar', stream_get_wrappers(), TRUE), 'The PHP version is <5.3.3. The built-in phar stream wrapper has been unregistered and not replaced.');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$this->assertTrue(in_array('phar', stream_get_wrappers(), TRUE), 'A phar stream wrapper is registered.');
|
||||||
|
$this->assertFalse(file_stream_wrapper_valid_scheme('phar'), 'The phar scheme is not a valid scheme for Drupal File API usage.');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure that calling file_get_stream_wrappers() multiple times, both
|
||||||
|
// without and with a drupal_static_reset() in between, does not create
|
||||||
|
// errors due to the PharStreamWrapperManager singleton.
|
||||||
|
file_get_stream_wrappers();
|
||||||
|
file_get_stream_wrappers();
|
||||||
|
drupal_static_reset('file_get_stream_wrappers');
|
||||||
|
file_get_stream_wrappers();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests that only valid phar files can be used.
|
||||||
|
*/
|
||||||
|
public function testPharFile() {
|
||||||
|
if (!in_array('phar', stream_get_wrappers(), TRUE)) {
|
||||||
|
$this->pass('There is no phar stream wrapper registered.');
|
||||||
|
// Nothing else in this test is relevant when there's no phar stream
|
||||||
|
// wrapper. testPharStreamWrapperRegistration() is sufficient for testing
|
||||||
|
// the conditions of when the stream wrapper should or should not be
|
||||||
|
// registered.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$base = dirname(dirname(__FILE__)) . '/files';
|
||||||
|
|
||||||
|
// Ensure that file operations via the phar:// stream wrapper work for phar
|
||||||
|
// files with the .phar extension.
|
||||||
|
$this->assertFalse(file_exists("phar://$base/phar-1.phar/no-such-file.php"));
|
||||||
|
$this->assertTrue(file_exists("phar://$base/phar-1.phar/index.php"));
|
||||||
|
$file_contents = file_get_contents("phar://$base/phar-1.phar/index.php");
|
||||||
|
$expected_hash = 'c7e7904ea573c5ebea3ef00bb08c1f86af1a45961fbfbeb1892ff4a98fd73ad5';
|
||||||
|
$this->assertIdentical($expected_hash, hash('sha256', $file_contents));
|
||||||
|
|
||||||
|
// Ensure that file operations via the phar:// stream wrapper throw an
|
||||||
|
// exception for files without the .phar extension.
|
||||||
|
try {
|
||||||
|
file_exists("phar://$base/image-2.jpg/index.php");
|
||||||
|
$this->fail('Expected exception failed to be thrown when accessing an invalid phar file.');
|
||||||
|
}
|
||||||
|
catch (Exception $e) {
|
||||||
|
$this->assertEqual(get_class($e), 'TYPO3\PharStreamWrapper\Exception', 'Expected exception thrown when accessing an invalid phar file.');
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ core = 7.x
|
|||||||
files[] = file_test.module
|
files[] = file_test.module
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ version = VERSION
|
|||||||
core = 7.x
|
core = 7.x
|
||||||
hidden = TRUE
|
hidden = TRUE
|
||||||
|
|
||||||
; Information added by Drupal.org packaging script on 2018-10-17
|
; Information added by Drupal.org packaging script on 2019-01-16
|
||||||
version = "7.60"
|
version = "7.63"
|
||||||
project = "drupal"
|
project = "drupal"
|
||||||
datestamp = "1539816636"
|
datestamp = "1547681965"
|
||||||
|
|||||||
@@ -1420,6 +1420,59 @@ class FormsFormStoragePageCacheTestCase extends DrupalWebTestCase {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test cache_form.
|
||||||
|
*/
|
||||||
|
class FormsFormCacheTestCase extends DrupalWebTestCase {
|
||||||
|
public static function getInfo() {
|
||||||
|
return array(
|
||||||
|
'name' => 'Form caching',
|
||||||
|
'description' => 'Tests storage and retrieval of forms from cache.',
|
||||||
|
'group' => 'Form API',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function setUp() {
|
||||||
|
parent::setUp('form_test');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests storing and retrieving the form from cache.
|
||||||
|
*/
|
||||||
|
function testCacheForm() {
|
||||||
|
$form = drupal_get_form('form_test_cache_form');
|
||||||
|
$form_state = array('foo' => 'bar', 'build_info' => array('baz'));
|
||||||
|
form_set_cache($form['#build_id'], $form, $form_state);
|
||||||
|
|
||||||
|
$cached_form_state = array();
|
||||||
|
$cached_form = form_get_cache($form['#build_id'], $cached_form_state);
|
||||||
|
|
||||||
|
$this->assertEqual($cached_form['#build_id'], $form['#build_id'], 'Form retrieved from cache_form successfully.');
|
||||||
|
$this->assertEqual($cached_form_state['foo'], 'bar', 'Data retrieved from cache_form successfully.');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests changing form_cache_expiration.
|
||||||
|
*/
|
||||||
|
function testCacheFormCustomExpiration() {
|
||||||
|
variable_set('form_cache_expiration', -1 * (24 * 60 * 60));
|
||||||
|
|
||||||
|
$form = drupal_get_form('form_test_cache_form');
|
||||||
|
$form_state = array('foo' => 'bar', 'build_info' => array('baz'));
|
||||||
|
form_set_cache($form['#build_id'], $form, $form_state);
|
||||||
|
|
||||||
|
// Clear expired entries from cache_form, which should include the entry we
|
||||||
|
// just stored. Without this, the form will still be retrieved from cache.
|
||||||
|
cache_clear_all(NULL, 'cache_form');
|
||||||
|
|
||||||
|
$cached_form_state = array();
|
||||||
|
$cached_form = form_get_cache($form['#build_id'], $cached_form_state);
|
||||||
|
|
||||||
|
$this->assertNull($cached_form, 'Expired form was not returned from cache.');
|
||||||
|
$this->assertTrue(empty($cached_form_state), 'No data retrieved from cache for expired form.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test wrapper form callbacks.
|
* Test wrapper form callbacks.
|
||||||
*/
|
*/
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user