KernelTestBaseNG™

.travis.yml

@@ -0,0 +1,17 @@
+language: php
+
+php:
+  - 5.4
+
+#before_script:
+#  - composer self-update
+#  # @todo Enable APC(u) extension.
+
+script:
+  # @todo Re-enable. For now, we know that it works.
+  #- phpunit -v -c core --testsuite Unit
+  # Disable XDebug after running unit tests.
+  - phpenv config-rm xdebug.ini
+  - php --version
+  # @todo Update to new stable once all fixes are in upstream.
+  - ./core/vendor/phpunit/phpunit/phpunit -v -c core --testsuite Kernel

core/config/install/menu_link.static.overrides.yml

@@ -0,0 +1 @@
+definitions: []

core/config/schema/core.menu.schema.yml

@@ -0,0 +1,27 @@
+
+menu_link.static.overrides:
+  type: mapping
+  label: 'Menu link overrides'
+  mapping:
+    definitions:
+      type: sequence
+      label: Definitions
+      sequence:
+        - type: mapping
+          label: Definition
+          mapping:
+            menu_name:
+              type: string
+              label: 'Menu name'
+            parent:
+              type: string
+              label: 'Parent'
+            weight:
+              type: integer
+              label: 'Weight'
+            expanded:
+              type: boolean
+              label: 'Expanded'
+            hidden:
+              type: boolean
+              label: 'Hidden'

core/core.services.yml

@@ -301,6 +301,11 @@ services:
     parent: default_plugin_manager
   plugin.cache_clearer:
     class: Drupal\Core\Plugin\CachedDiscoveryClearer
+  paramconverter.menu_link:
+    class: Drupal\Core\ParamConverter\MenuLinkPluginConverter
+    tags:
+      - { name: paramconverter }
+    arguments: ['@plugin.manager.menu.link']
   menu.tree_storage:
     class: Drupal\Core\Menu\MenuTreeStorage
     arguments: ['@database', '@cache.menu', 'menu_tree']

core/includes/batch.inc

@@ -319,9 +319,9 @@ function _batch_process() {
       '@total'      => $total,
       '@current'    => floor($current),
       '@percentage' => $percentage,
-      '@elapsed'    => format_interval($elapsed / 1000),
+      '@elapsed'    => \Drupal::service('date')->formatInterval($elapsed / 1000),
       // If possible, estimate remaining processing time.
-      '@estimate'   => ($current > 0) ? format_interval(($elapsed * ($total - $current) / $current) / 1000) : '-',
+      '@estimate'   => ($current > 0) ? \Drupal::service('date')->formatInterval(($elapsed * ($total - $current) / $current) / 1000) : '-',
     );
     $message = strtr($progress_message, $values);
     if (!empty($task_message)) {
@@ -410,7 +410,7 @@ function _batch_finished() {
       if (is_callable($batch_set['finished'])) {
         $queue = _batch_queue($batch_set);
         $operations = $queue->getAllItems();
-        call_user_func_array($batch_set['finished'], array($batch_set['success'], $batch_set['results'], $operations, format_interval($batch_set['elapsed'] / 1000)));
+        call_user_func_array($batch_set['finished'], array($batch_set['success'], $batch_set['results'], $operations, \Drupal::service('date')->formatInterval($batch_set['elapsed'] / 1000)));
       }
     }
   }

core/includes/bootstrap.inc

@@ -26,8 +26,11 @@ const DRUPAL_MINIMUM_PHP = '5.4.2';
 
 /**
  * Minimum recommended value of PHP memory_limit.
+ *
+ * @todo Reduce the memory required to install on some environments in
+ *   https://www.drupal.org/node/2289201 and then decrease this limit.
  */
-const DRUPAL_MINIMUM_PHP_MEMORY_LIMIT = '32M';
+const DRUPAL_MINIMUM_PHP_MEMORY_LIMIT = '64M';
 
 /**
  * Error reporting level: display no errors.
@@ -173,7 +176,9 @@ const DRUPAL_EXTENSION_NAME_MAX_LENGTH = 50;
  * @see http://php.net/manual/reserved.variables.server.php
  * @see http://php.net/manual/function.time.php
  */
-define('REQUEST_TIME', (int) $_SERVER['REQUEST_TIME']);
+if (!defined('REQUEST_TIME')) {
+  define('REQUEST_TIME', (int) $_SERVER['REQUEST_TIME']);
+}
 
 /**
  * Regular expression to match PHP function names.
@@ -201,7 +206,9 @@ const CONFIG_STAGING_DIRECTORY = 'staging';
  *
  * This strips two levels of directories off the current directory.
  */
-define('DRUPAL_ROOT', dirname(dirname(__DIR__)));
+if (!defined('DRUPAL_ROOT')) {
+  define('DRUPAL_ROOT', dirname(dirname(__DIR__)));
+}
 
 /**
  * Returns the appropriate configuration directory.

core/includes/common.inc

@@ -310,6 +310,7 @@ function drupal_get_feeds() {
  *     not available, the current path.
  *
  * @see current_path()
+ * @ingroup form_api
  */
 function drupal_get_destination() {
   $destination = &drupal_static(__FUNCTION__);

core/includes/file.inc

@@ -880,7 +880,7 @@ function file_munge_filename($filename, $extensions, $alerts = TRUE) {
     // Remove any null bytes. See http://php.net/manual/en/security.filesystem.nullbytes.php
     $filename = str_replace(chr(0), '', $filename);
 
-    $whitelist = array_unique(explode(' ', trim($extensions)));
+    $whitelist = array_unique(explode(' ', strtolower(trim($extensions))));
 
     // Split the filename up by periods. The first part becomes the basename
     // the last part the final extension.
@@ -893,7 +893,7 @@ function file_munge_filename($filename, $extensions, $alerts = TRUE) {
     // of allowed extensions.
     foreach ($filename_parts as $filename_part) {
       $new_filename .= '.' . $filename_part;
-      if (!in_array($filename_part, $whitelist) && preg_match("/^[a-zA-Z]{2,5}\d?$/", $filename_part)) {
+      if (!in_array(strtolower($filename_part), $whitelist) && preg_match("/^[a-zA-Z]{2,5}\d?$/", $filename_part)) {
         $new_filename .= '_';
       }
     }
@@ -1297,16 +1297,19 @@ function file_upload_max_size() {
  * @param $mapping
  *   An optional map of extensions to their mimetypes, in the form:
  *    - 'mimetypes': a list of mimetypes, keyed by an identifier,
- *    - 'extensions': the mapping itself, an associative array in which
- *      the key is the extension (lowercase) and the value is the mimetype
- *      identifier. If $mapping is NULL file_mimetype_mapping() is called.
+ *    - 'extensions': the mapping itself, an associative array in which the key
+ *      is the extension (lowercase) and the value is the mimetype identifier.
  *
  * @return
  *   The internet media type registered for the extension or
  *   application/octet-stream for unknown extensions.
  *
- * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal::service('file.mime_type.guesser')->guess($uri).
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Calls are
+ *   passed on to a new file.mime_type.guesser service, and the $mapping
+ *   parameter is ignored. Use
+ *   \Drupal::service('file.mime_type.guesser')->guess($uri).
+ *
+ * @see \Drupal\Core\File\MimeType\ExtensionMimeTypeGuesser::guess()
  */
 function file_get_mimetype($uri, $mapping = NULL) {
   return \Drupal::service('file.mime_type.guesser')->guess($uri);

core/includes/install.inc

@@ -209,7 +209,7 @@ function drupal_rewrite_settings($settings = array(), $settings_file = NULL) {
     }
     $variable_names['$'. $setting] = $setting;
   }
-  $contents = file_get_contents(DRUPAL_ROOT . '/' . $settings_file);
+  $contents = file_get_contents($settings_file);
   if ($contents !== FALSE) {
     // Initialize the contents for the settings.php file if it is empty.
     if (trim($contents) === '') {
@@ -314,7 +314,7 @@ function drupal_rewrite_settings($settings = array(), $settings_file = NULL) {
     }
 
     // Write the new settings file.
-    if (file_put_contents(DRUPAL_ROOT . '/' . $settings_file, $buffer) === FALSE) {
+    if (file_put_contents($settings_file, $buffer) === FALSE) {
       throw new Exception(t('Failed to modify %settings. Verify the file permissions.', array('%settings' => $settings_file)));
     }
     else {

core/lib/Drupal/Component/Discovery/YamlDiscovery.php

@@ -28,6 +28,15 @@ class YamlDiscovery implements DiscoverableInterface {
    */
   protected $directories = array();
 
+  /**
+   * Array of all parsed files, keyed by filename.
+   *
+   * Especially during kernel tests, YAML files are re-parsed often.
+   *
+   * @var array
+   */
+  protected static $parsedFiles = array();
+
   /**
    * Constructs a YamlDiscovery object.
    *
@@ -48,9 +57,11 @@ public function __construct($name, array $directories) {
   public function findAll() {
     $all = array();
     foreach ($this->findFiles() as $provider => $file) {
-      $all[$provider] = Yaml::decode(file_get_contents($file));
+      if (!isset(static::$parsedFiles[$file])) {
+        static::$parsedFiles[$file] = Yaml::decode(file_get_contents($file));
+      }
+      $all[$provider] = static::$parsedFiles[$file];
     }
-
     return $all;
   }
 

core/lib/Drupal/Core/Config/Config.php

@@ -110,7 +110,7 @@ public function get($key = '') {
    * {@inheritdoc}
    */
   public function setData(array $data) {
-    $this->data = $data;
+    parent::setData($data);
     $this->resetOverriddenData();
     return $this;
   }

core/lib/Drupal/Core/Config/ConfigBase.php

@@ -160,8 +160,12 @@ public function get($key = '') {
    *
    * @return $this
    *   The configuration object.
+   *
+   * @throws \Drupal\Core\Config\ConfigValueException
+   *   If any key in $data in any depth contains a dot.
    */
   public function setData(array $data) {
+    $this->validateKeys($data);
     $this->data = $data;
     return $this;
   }
@@ -176,10 +180,16 @@ public function setData(array $data) {
    *
    * @return $this
    *   The configuration object.
+   *
+   * @throws \Drupal\Core\Config\ConfigValueException
+   *   If $value is an array and any of its keys in any depth contains a dot.
    */
   public function set($key, $value) {
     // The dot/period is a reserved character; it may appear between keys, but
     // not within keys.
+    if (is_array($value)) {
+      $this->validateKeys($value);
+    }
     $parts = explode('.', $key);
     if (count($parts) == 1) {
       $this->data[$key] = $value;
@@ -190,6 +200,28 @@ public function set($key, $value) {
     return $this;
   }
 
+  /**
+   * Validates all keys in a passed in config array structure.
+   *
+   * @param array $data
+   *   Configuration array structure.
+   *
+   * @return null
+   *
+   * @throws \Drupal\Core\Config\ConfigValueException
+   *   If any key in $data in any depth contains a dot.
+   */
+  protected function validateKeys(array $data) {
+    foreach ($data as $key => $value) {
+      if (strpos($key, '.') !== FALSE) {
+        throw new ConfigValueException(String::format('@key key contains a dot which is not supported.', array('@key' => $key)));
+      }
+      if (is_array($value)) {
+        $this->validateKeys($value);
+      }
+    }
+  }
+
   /**
    * Unsets a value in this configuration object.
    *

core/lib/Drupal/Core/Config/ConfigImporter.php

@@ -198,6 +198,7 @@ public function __construct(StorageComparerInterface $storage_comparer, EventDis
    *   The message to log.
    */
   public function logError($message) {
+    trigger_error($message, E_USER_ERROR);
     $this->errors[] = $message;
   }
 

core/lib/Drupal/Core/Config/ConfigValueException.php

@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Config\ConfigValueException.
+ */
+
+namespace Drupal\Core\Config;
+
+/**
+ * Exception thrown when config object values are invalid.
+ */
+class ConfigValueException extends ConfigException {}

core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php

@@ -132,9 +132,15 @@ public function deleteRevision($revision_id) {
   }
 
   /**
-   * {@inheritdoc}
+   * Returns the prefix used to create the configuration name.
+   *
+   * The prefix consists of the config prefix from the entity type plus a dot
+   * for separating from the ID.
+   *
+   * @return string
+   *   The full configuration prefix, for example 'views.view.'.
    */
-  public function getConfigPrefix() {
+  protected function getPrefix() {
     return $this->entityType->getConfigPrefix() . '.';
   }
 
@@ -149,7 +155,7 @@ public static function getIDFromConfigName($config_name, $config_prefix) {
    * {@inheritdoc}
    */
   protected function doLoadMultiple(array $ids = NULL) {
-    $prefix = $this->getConfigPrefix();
+    $prefix = $this->getPrefix();
 
     // Get the names of the configuration entities we are going to load.
     if ($ids === NULL) {
@@ -187,7 +193,7 @@ protected function doCreate(array $values) {
    */
   protected function doDelete($entities) {
     foreach ($entities as $entity) {
-      $config = $this->configFactory->get($this->getConfigPrefix() . $entity->id());
+      $config = $this->configFactory->get($this->getPrefix() . $entity->id());
       $config->delete();
     }
   }
@@ -224,7 +230,7 @@ public function save(EntityInterface $entity) {
    */
   protected function doSave($id, EntityInterface $entity) {
     $is_new = $entity->isNew();
-    $prefix = $this->getConfigPrefix();
+    $prefix = $this->getPrefix();
     if ($id !== $entity->id()) {
       // Renaming a config object needs to cater for:
       // - Storage needs to access the original object.
@@ -237,19 +243,33 @@ protected function doSave($id, EntityInterface $entity) {
     }
 
     // Retrieve the desired properties and set them in config.
-    foreach ($entity->toArray() as $key => $value) {
+    $record = $this->mapToStorageRecord($entity);
+    foreach ($record as $key => $value) {
       $config->set($key, $value);
     }
     $config->save();
 
     return $is_new ? SAVED_NEW : SAVED_UPDATED;
   }
 
+  /**
+   * Maps from an entity object to the storage record.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity object.
+   *
+   * @return array
+   *   The record to store.
+   */
+  protected function mapToStorageRecord(EntityInterface $entity) {
+    return $entity->toArray();
+  }
+
   /**
    * {@inheritdoc}
    */
   protected function has($id, EntityInterface $entity) {
-    $prefix = $this->getConfigPrefix();
+    $prefix = $this->getPrefix();
     $config = $this->configFactory->get($prefix . $id);
     return !$config->isNew();
   }