+ * - subject: Subject of the e-mail to be sent. This must not contain any
+ * newline characters, or the mail may not be sent properly.
+ * - body: Message to be sent. Accepts both CRLF and LF line-endings.
+ * E-mail bodies must be wrapped. You can use drupal_wrap_mail() for
+ * smart plain text wrapping.
+ * - headers: Associative array containing all additional mail headers not
+ * defined by one of the other parameters. PHP's mail() looks for Cc
+ * and Bcc headers and sends the mail to addresses in these headers too.
+ *
+ * @return bool
+ * TRUE if the mail was successfully accepted for delivery, otherwise FALSE.
+ */
+ public function mail(array $message);
+}
diff --git a/core/modules/system/system.mail.inc b/core/lib/Drupal/Core/Mail/PhpMail.php
similarity index 80%
rename from core/modules/system/system.mail.inc
rename to core/lib/Drupal/Core/Mail/PhpMail.php
index 1ce9fc0..668cc51 100644
--- a/core/modules/system/system.mail.inc
+++ b/core/lib/Drupal/Core/Mail/PhpMail.php
@@ -2,20 +2,23 @@
/**
* @file
- * Drupal core implementations of MailSystemInterface.
+ * Definition of Drupal\Core\Mail\PhpMail.
*/
+namespace Drupal\Core\Mail;
+
/**
* The default Drupal mail backend using PHP's mail function.
*/
-class DefaultMailSystem implements MailSystemInterface {
+class PhpMail implements MailInterface {
+
/**
- * Concatenate and wrap the e-mail body for plain-text mails.
+ * Concatenates and wrap the e-mail body for plain-text mails.
*
- * @param $message
+ * @param array $message
* A message array, as described in hook_mail_alter().
*
- * @return
+ * @return array
* The formatted $message.
*/
public function format(array $message) {
@@ -25,19 +28,21 @@ class DefaultMailSystem implements MailSystemInterface {
$message['body'] = drupal_html_to_text($message['body']);
// Wrap the mail body for sending.
$message['body'] = drupal_wrap_mail($message['body']);
+
return $message;
}
/**
- * Send an e-mail message, using Drupal variables and default settings.
- *
- * @see http://php.net/manual/en/function.mail.php
- * @see drupal_mail()
+ * Sends an e-mail message, using Drupal variables and default settings.
*
- * @param $message
+ * @param array $message
* A message array, as described in hook_mail_alter().
- * @return
+ *
+ * @return bool
* TRUE if the mail was successfully accepted, otherwise FALSE.
+ *
+ * @see http://php.net/manual/en/function.mail.php
+ * @see drupal_mail()
*/
public function mail(array $message) {
// If 'Return-Path' isn't already set in php.ini, we pass it separately
@@ -107,27 +112,7 @@ class DefaultMailSystem implements MailSystemInterface {
);
ini_set('sendmail_from', $old_from);
}
- return $mail_result;
- }
-}
-/**
- * A mail sending implementation that captures sent messages to a variable.
- *
- * This class is for running tests or for development.
- */
-class TestingMailSystem extends DefaultMailSystem implements MailSystemInterface {
- /**
- * Accept an e-mail message and store it in a variable.
- *
- * @param $message
- * An e-mail message.
- */
- public function mail(array $message) {
- $captured_emails = variable_get('drupal_test_email_collector', array());
- $captured_emails[] = $message;
- variable_set('drupal_test_email_collector', $captured_emails);
- return TRUE;
+ return $mail_result;
}
}
-
diff --git a/core/lib/Drupal/Core/Mail/VariableLog.php b/core/lib/Drupal/Core/Mail/VariableLog.php
new file mode 100644
index 0000000..3dfe5b6
--- /dev/null
+++ b/core/lib/Drupal/Core/Mail/VariableLog.php
@@ -0,0 +1,30 @@
+ $this->name))->fetchObject();
+ if ($item) {
+ $item->data = unserialize($item->data);
+ return $item;
+ }
+ return FALSE;
+ }
+
+ /**
+ * Retrieves all remaining items in the queue.
+ *
+ * This is specific to Batch API and is not part of the
+ * Drupal\Core\Queue\QueueInterface.
+ *
+ * @return array
+ * An array of queue items.
+ */
+ public function getAllItems() {
+ $result = array();
+ $items = db_query('SELECT data FROM {queue} q WHERE name = :name ORDER BY item_id ASC', array(':name' => $this->name))->fetchAll();
+ foreach ($items as $item) {
+ $result[] = unserialize($item->data);
+ }
+ return $result;
+ }
+}
diff --git a/core/lib/Drupal/Core/Queue/BatchMemory.php b/core/lib/Drupal/Core/Queue/BatchMemory.php
new file mode 100644
index 0000000..fcc49f5
--- /dev/null
+++ b/core/lib/Drupal/Core/Queue/BatchMemory.php
@@ -0,0 +1,52 @@
+queue)) {
+ reset($this->queue);
+ return current($this->queue);
+ }
+ return FALSE;
+ }
+
+ /**
+ * Retrieves all remaining items in the queue.
+ *
+ * This is specific to Batch API and is not part of the
+ * Drupal\Core\Queue\QueueInterface.
+ *
+ * @return array
+ * An array of queue items.
+ */
+ public function getAllItems() {
+ $result = array();
+ foreach ($this->queue as $item) {
+ $result[] = $item->data;
+ }
+ return $result;
+ }
+}
diff --git a/core/lib/Drupal/Core/Queue/Memory.php b/core/lib/Drupal/Core/Queue/Memory.php
new file mode 100644
index 0000000..d741bda
--- /dev/null
+++ b/core/lib/Drupal/Core/Queue/Memory.php
@@ -0,0 +1,107 @@
+queue = array();
+ $this->idSequence = 0;
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::createItem().
+ */
+ public function createItem($data) {
+ $item = new stdClass();
+ $item->item_id = $this->idSequence++;
+ $item->data = $data;
+ $item->created = time();
+ $item->expire = 0;
+ $this->queue[$item->item_id] = $item;
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::numberOfItems().
+ */
+ public function numberOfItems() {
+ return count($this->queue);
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::claimItem().
+ */
+ public function claimItem($lease_time = 30) {
+ foreach ($this->queue as $key => $item) {
+ if ($item->expire == 0) {
+ $item->expire = time() + $lease_time;
+ $this->queue[$key] = $item;
+ return $item;
+ }
+ }
+ return FALSE;
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::deleteItem().
+ */
+ public function deleteItem($item) {
+ unset($this->queue[$item->item_id]);
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::releaseItem().
+ */
+ public function releaseItem($item) {
+ if (isset($this->queue[$item->item_id]) && $this->queue[$item->item_id]->expire != 0) {
+ $this->queue[$item->item_id]->expire = 0;
+ return TRUE;
+ }
+ return FALSE;
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::createQueue().
+ */
+ public function createQueue() {
+ // Nothing needed here.
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::deleteQueue().
+ */
+ public function deleteQueue() {
+ $this->queue = array();
+ $this->idSequence = 0;
+ }
+}
diff --git a/core/lib/Drupal/Core/Queue/QueueInterface.php b/core/lib/Drupal/Core/Queue/QueueInterface.php
new file mode 100644
index 0000000..90d4b00
--- /dev/null
+++ b/core/lib/Drupal/Core/Queue/QueueInterface.php
@@ -0,0 +1,114 @@
+name = $name;
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::createItem().
+ */
+ public function createItem($data) {
+ // During a Drupal 6.x to 8.x update, drupal_get_schema() does not contain
+ // the queue table yet, so we cannot rely on drupal_write_record().
+ $query = db_insert('queue')
+ ->fields(array(
+ 'name' => $this->name,
+ 'data' => serialize($data),
+ // We cannot rely on REQUEST_TIME because many items might be created
+ // by a single request which takes longer than 1 second.
+ 'created' => time(),
+ ));
+ return (bool) $query->execute();
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::numberOfItems().
+ */
+ public function numberOfItems() {
+ return db_query('SELECT COUNT(item_id) FROM {queue} WHERE name = :name', array(':name' => $this->name))->fetchField();
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::claimItem().
+ */
+ public function claimItem($lease_time = 30) {
+ // Claim an item by updating its expire fields. If claim is not successful
+ // another thread may have claimed the item in the meantime. Therefore loop
+ // until an item is successfully claimed or we are reasonably sure there
+ // are no unclaimed items left.
+ while (TRUE) {
+ $item = db_query_range('SELECT data, item_id FROM {queue} q WHERE expire = 0 AND name = :name ORDER BY created ASC', 0, 1, array(':name' => $this->name))->fetchObject();
+ if ($item) {
+ // Try to update the item. Only one thread can succeed in UPDATEing the
+ // same row. We cannot rely on REQUEST_TIME because items might be
+ // claimed by a single consumer which runs longer than 1 second. If we
+ // continue to use REQUEST_TIME instead of the current time(), we steal
+ // time from the lease, and will tend to reset items before the lease
+ // should really expire.
+ $update = db_update('queue')
+ ->fields(array(
+ 'expire' => time() + $lease_time,
+ ))
+ ->condition('item_id', $item->item_id)
+ ->condition('expire', 0);
+ // If there are affected rows, this update succeeded.
+ if ($update->execute()) {
+ $item->data = unserialize($item->data);
+ return $item;
+ }
+ }
+ else {
+ // No items currently available to claim.
+ return FALSE;
+ }
+ }
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::releaseItem().
+ */
+ public function releaseItem($item) {
+ $update = db_update('queue')
+ ->fields(array(
+ 'expire' => 0,
+ ))
+ ->condition('item_id', $item->item_id);
+ return $update->execute();
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::deleteItem().
+ */
+ public function deleteItem($item) {
+ db_delete('queue')
+ ->condition('item_id', $item->item_id)
+ ->execute();
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::createQueue().
+ */
+ public function createQueue() {
+ // All tasks are stored in a single database table (which is created when
+ // Drupal is first installed) so there is nothing we need to do to create
+ // a new queue.
+ }
+
+ /**
+ * Implements Drupal\Core\Queue\QueueInterface::deleteQueue().
+ */
+ public function deleteQueue() {
+ db_delete('queue')
+ ->condition('name', $this->name)
+ ->execute();
+ }
+}
diff --git a/core/includes/stream_wrappers.inc b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
similarity index 55%
rename from core/includes/stream_wrappers.inc
rename to core/lib/Drupal/Core/StreamWrapper/LocalStream.php
index 0edcee1..9f2b95d 100644
--- a/core/includes/stream_wrappers.inc
+++ b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
@@ -2,247 +2,34 @@
/**
* @file
- * Drupal stream wrapper interface.
- *
- * Provides a Drupal interface and classes to implement PHP stream wrappers for
- * public, private, and temporary files.
- *
- * A stream wrapper is an abstraction of a file system that allows Drupal to
- * use the same set of methods to access both local files and remote resources.
- *
- * Note that PHP 5.2 fopen() only supports URIs of the form "scheme://target"
- * despite the fact that according to RFC 3986 a URI's scheme component
- * delimiter is in general just ":", not "://". Because of this PHP limitation
- * and for consistency Drupal will only accept URIs of form "scheme://target".
- *
- * @see http://www.faqs.org/rfcs/rfc3986.html
- * @see http://bugs.php.net/bug.php?id=47070
- */
-
-/**
- * Stream wrapper bit flags that are the basis for composite types.
- *
- * Note that 0x0002 is skipped, because it was the value of a constant that has
- * since been removed.
- */
-
-/**
- * Stream wrapper bit flag -- a filter that matches all wrappers.
- */
-const STREAM_WRAPPERS_ALL = 0x0000;
-
-/**
- * Stream wrapper bit flag -- refers to a local file system location.
- */
-const STREAM_WRAPPERS_LOCAL = 0x0001;
-
-/**
- * Stream wrapper bit flag -- wrapper is readable (almost always true).
- */
-const STREAM_WRAPPERS_READ = 0x0004;
-
-/**
- * Stream wrapper bit flag -- wrapper is writeable.
- */
-const STREAM_WRAPPERS_WRITE = 0x0008;
-
-/**
- * Stream wrapper bit flag -- exposed in the UI and potentially web accessible.
- */
-const STREAM_WRAPPERS_VISIBLE = 0x0010;
-
-/**
- * Composite stream wrapper bit flags that are usually used as the types.
- */
-
-/**
- * Stream wrapper type flag -- not visible in the UI or accessible via web,
- * but readable and writable. E.g. the temporary directory for uploads.
+ * Definition of Drupal\Core\StreamWrapper\LocalStream.
*/
-define('STREAM_WRAPPERS_HIDDEN', STREAM_WRAPPERS_READ | STREAM_WRAPPERS_WRITE);
-/**
- * Stream wrapper type flag -- hidden, readable and writeable using local files.
- */
-define('STREAM_WRAPPERS_LOCAL_HIDDEN', STREAM_WRAPPERS_LOCAL | STREAM_WRAPPERS_HIDDEN);
+namespace Drupal\Core\StreamWrapper;
/**
- * Stream wrapper type flag -- visible, readable and writeable.
- */
-define('STREAM_WRAPPERS_WRITE_VISIBLE', STREAM_WRAPPERS_READ | STREAM_WRAPPERS_WRITE | STREAM_WRAPPERS_VISIBLE);
-
-/**
- * Stream wrapper type flag -- visible and read-only.
- */
-define('STREAM_WRAPPERS_READ_VISIBLE', STREAM_WRAPPERS_READ | STREAM_WRAPPERS_VISIBLE);
-
-/**
- * Stream wrapper type flag -- the default when 'type' is omitted from
- * hook_stream_wrappers(). This does not include STREAM_WRAPPERS_LOCAL,
- * because PHP grants a greater trust level to local files (for example, they
- * can be used in an "include" statement, regardless of the "allow_url_include"
- * setting), so stream wrappers need to explicitly opt-in to this.
- */
-define('STREAM_WRAPPERS_NORMAL', STREAM_WRAPPERS_WRITE_VISIBLE);
-
-/**
- * Stream wrapper type flag -- visible, readable and writeable using local files.
- */
-define('STREAM_WRAPPERS_LOCAL_NORMAL', STREAM_WRAPPERS_LOCAL | STREAM_WRAPPERS_NORMAL);
-
-/**
- * Generic PHP stream wrapper interface.
- *
- * @see http://www.php.net/manual/en/class.streamwrapper.php
- */
-interface StreamWrapperInterface {
- public function stream_open($uri, $mode, $options, &$opened_url);
- public function stream_close();
- public function stream_lock($operation);
- public function stream_read($count);
- public function stream_write($data);
- public function stream_eof();
- public function stream_seek($offset, $whence);
- public function stream_flush();
- public function stream_tell();
- public function stream_stat();
- public function unlink($uri);
- public function rename($from_uri, $to_uri);
- public function mkdir($uri, $mode, $options);
- public function rmdir($uri, $options);
- public function url_stat($uri, $flags);
- public function dir_opendir($uri, $options);
- public function dir_readdir();
- public function dir_rewinddir();
- public function dir_closedir();
-}
-
-/**
- * Drupal stream wrapper extension.
- *
- * Extend the StreamWrapperInterface with methods expected by Drupal stream
- * wrapper classes.
- */
-interface DrupalStreamWrapperInterface extends StreamWrapperInterface {
- /**
- * Set the absolute stream resource URI.
- *
- * This allows you to set the URI. Generally is only called by the factory
- * method.
- *
- * @param $uri
- * A string containing the URI that should be used for this instance.
- */
- function setUri($uri);
-
- /**
- * Returns the stream resource URI.
- *
- * @return
- * Returns the current URI of the instance.
- */
- public function getUri();
-
- /**
- * Returns a web accessible URL for the resource.
- *
- * This function should return a URL that can be embedded in a web page
- * and accessed from a browser. For example, the external URL of
- * "youtube://xIpLd0WQKCY" might be
- * "http://www.youtube.com/watch?v=xIpLd0WQKCY".
- *
- * @return
- * Returns a string containing a web accessible URL for the resource.
- */
- public function getExternalUrl();
-
- /**
- * Returns the MIME type of the resource.
- *
- * @param $uri
- * The URI, path, or filename.
- * @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 and the value is the mimetype identifier.
- *
- * @return
- * Returns a string containing the MIME type of the resource.
- */
- public static function getMimeType($uri, $mapping = NULL);
-
- /**
- * Changes permissions of the resource.
- *
- * PHP lacks this functionality and it is not part of the official stream
- * wrapper interface. This is a custom implementation for Drupal.
- *
- * @param $mode
- * Integer value for the permissions. Consult PHP chmod() documentation
- * for more information.
- *
- * @return
- * Returns TRUE on success or FALSE on failure.
- */
- public function chmod($mode);
-
- /**
- * Returns canonical, absolute path of the resource.
- *
- * Implementation placeholder. PHP's realpath() does not support stream
- * wrappers. We provide this as a default so that individual wrappers may
- * implement their own solutions.
- *
- * @return
- * Returns a string with absolute pathname on success (implemented
- * by core wrappers), or FALSE on failure or if the registered
- * wrapper does not provide an implementation.
- */
- public function realpath();
-
- /**
- * Gets the name of the directory from a given path.
- *
- * This method is usually accessed through drupal_dirname(), which wraps
- * around the normal PHP dirname() function, which does not support stream
- * wrappers.
- *
- * @param $uri
- * An optional URI.
- *
- * @return
- * A string containing the directory name, or FALSE if not applicable.
- *
- * @see drupal_dirname()
- */
- public function dirname($uri = NULL);
-}
-
-
-/**
- * Drupal stream wrapper base class for local files.
+ * Defines a Drupal stream wrapper base class for local files.
*
* This class provides a complete stream wrapper implementation. URIs such as
* "public://example.txt" are expanded to a normal filesystem path such as
* "sites/default/files/example.txt" and then PHP filesystem functions are
* invoked.
*
- * DrupalLocalStreamWrapper implementations need to implement at least the
+ * Drupal\Core\StreamWrapper\LocalStream implementations need to implement at least the
* getDirectoryPath() and getExternalUrl() methods.
*/
-abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface {
+abstract class LocalStream implements StreamWrapperInterface {
/**
* Stream context resource.
*
- * @var Resource
+ * @var resource
*/
public $context;
/**
* A generic resource handle.
*
- * @var Resource
+ * @var resource
*/
public $handle = NULL;
@@ -251,7 +38,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
*
* A stream is referenced as "scheme://target".
*
- * @var String
+ * @var string
*/
protected $uri;
@@ -259,20 +46,20 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
* Gets the path that the wrapper is responsible for.
* @TODO: Review this method name in D8 per http://drupal.org/node/701358
*
- * @return
+ * @return string
* String specifying the path.
*/
abstract function getDirectoryPath();
/**
- * Base implementation of setUri().
+ * Implements Drupal\Core\StreamWrapper\StreamWrapperInterface::setUri().
*/
function setUri($uri) {
$this->uri = $uri;
}
/**
- * Base implementation of getUri().
+ * Implements Drupal\Core\StreamWrapper\StreamWrapperInterface::getUri().
*/
function getUri() {
return $this->uri;
@@ -287,10 +74,10 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
* method may return a URI or path suitable for writing that is completely
* separate from the URI used for reading.
*
- * @param $uri
+ * @param string $uri
* Optional URI.
*
- * @return
+ * @return string|bool
* Returns a string representing a location suitable for writing of a file,
* or FALSE if unable to write to the file such as with read-only streams.
*/
@@ -306,7 +93,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
}
/**
- * Base implementation of getMimeType().
+ * Implements Drupal\Core\StreamWrapper\StreamWrapperInterface::getMimeType().
*/
static function getMimeType($uri, $mapping = NULL) {
if (!isset($mapping)) {
@@ -338,7 +125,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
}
/**
- * Base implementation of chmod().
+ * Implements Drupal\Core\StreamWrapper\StreamWrapperInterface::chmod().
*/
function chmod($mode) {
$output = @chmod($this->getLocalPath(), $mode);
@@ -349,7 +136,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
}
/**
- * Base implementation of realpath().
+ * Implements Drupal\Core\StreamWrapper\StreamWrapperInterface::realpath().
*/
function realpath() {
return $this->getLocalPath();
@@ -362,9 +149,10 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
* (optional) The stream wrapper URI to be converted to a canonical
* absolute path. This may point to a directory or another type of file.
*
- * @return string|false
+ * @return string|bool
* If $uri is not set, returns the canonical absolute path of the URI
- * previously set by the DrupalStreamWrapperInterface::setUri() function.
+ * previously set by the
+ * Drupal\Core\StreamWrapper\StreamWrapperInterface::setUri() function.
* If $uri is set and valid for this class, returns its canonical absolute
* path, as determined by the realpath() function. If $uri is set but not
* valid, returns FALSE.
@@ -389,16 +177,16 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for fopen(), file_get_contents(), file_put_contents() etc.
*
- * @param $uri
+ * @param string $uri
* A string containing the URI to the file to open.
- * @param $mode
+ * @param int $mode
* The file mode ("r", "wb" etc.).
- * @param $options
+ * @param int $options
* A bit mask of STREAM_USE_PATH and STREAM_REPORT_ERRORS.
- * @param $opened_path
+ * @param string $opened_path
* A string containing the path actually opened.
*
- * @return
+ * @return bool
* Returns TRUE if file was opened successfully.
*
* @see http://php.net/manual/en/streamwrapper.stream-open.php
@@ -418,7 +206,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for flock().
*
- * @param $operation
+ * @param int $operation
* One of the following:
* - LOCK_SH to acquire a shared lock (reader).
* - LOCK_EX to acquire an exclusive lock (writer).
@@ -426,7 +214,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
* - LOCK_NB if you don't want flock() to block while locking (not
* supported on Windows).
*
- * @return
+ * @return bool
* Always returns TRUE at the present time.
*
* @see http://php.net/manual/en/streamwrapper.stream-lock.php
@@ -442,10 +230,10 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for fread(), file_get_contents() etc.
*
- * @param $count
+ * @param int $count
* Maximum number of bytes to be read.
*
- * @return
+ * @return string|bool
* The string that was read, or FALSE in case of an error.
*
* @see http://php.net/manual/en/streamwrapper.stream-read.php
@@ -457,11 +245,11 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for fwrite(), file_put_contents() etc.
*
- * @param $data
+ * @param string $data
* The string to be written.
*
- * @return
- * The number of bytes written (integer).
+ * @return int
+ * The number of bytes written.
*
* @see http://php.net/manual/en/streamwrapper.stream-write.php
*/
@@ -472,7 +260,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for feof().
*
- * @return
+ * @return bool
* TRUE if end-of-file has been reached.
*
* @see http://php.net/manual/en/streamwrapper.stream-eof.php
@@ -484,12 +272,12 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for fseek().
*
- * @param $offset
+ * @param int $offset
* The byte offset to got to.
- * @param $whence
+ * @param int $whence
* SEEK_SET, SEEK_CUR, or SEEK_END.
*
- * @return
+ * @return bool
* TRUE on success.
*
* @see http://php.net/manual/en/streamwrapper.stream-seek.php
@@ -503,7 +291,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for fflush().
*
- * @return
+ * @return bool
* TRUE if data was successfully stored (or there was no data to store).
*
* @see http://php.net/manual/en/streamwrapper.stream-flush.php
@@ -515,7 +303,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for ftell().
*
- * @return
+ * @return bool
* The current offset in bytes from the beginning of file.
*
* @see http://php.net/manual/en/streamwrapper.stream-tell.php
@@ -527,7 +315,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for fstat().
*
- * @return
+ * @return bool
* An array with file status, or FALSE in case of an error - see fstat()
* for a description of this array.
*
@@ -540,7 +328,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for fclose().
*
- * @return
+ * @return bool
* TRUE if stream was successfully closed.
*
* @see http://php.net/manual/en/streamwrapper.stream-close.php
@@ -552,10 +340,10 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for unlink().
*
- * @param $uri
+ * @param string $uri
* A string containing the uri to the resource to delete.
*
- * @return
+ * @return bool
* TRUE if resource was successfully deleted.
*
* @see http://php.net/manual/en/streamwrapper.unlink.php
@@ -568,12 +356,12 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for rename().
*
- * @param $from_uri,
+ * @param string $from_uri,
* The uri to the file to rename.
- * @param $to_uri
+ * @param string $to_uri
* The new uri for file.
*
- * @return
+ * @return bool
* TRUE if file was successfully renamed.
*
* @see http://php.net/manual/en/streamwrapper.rename.php
@@ -589,10 +377,10 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
* around the PHP dirname() function because it does not support stream
* wrappers.
*
- * @param $uri
+ * @param string $uri
* A URI or path.
*
- * @return
+ * @return string
* A string containing the directory name.
*
* @see drupal_dirname()
@@ -612,14 +400,14 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for mkdir().
*
- * @param $uri
+ * @param string $uri
* A string containing the URI to the directory to create.
- * @param $mode
+ * @param int $mode
* Permission flags - see mkdir().
- * @param $options
+ * @param int $options
* A bit mask of STREAM_REPORT_ERRORS and STREAM_MKDIR_RECURSIVE.
*
- * @return
+ * @return bool
* TRUE if directory was successfully created.
*
* @see http://php.net/manual/en/streamwrapper.mkdir.php
@@ -646,12 +434,12 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for rmdir().
*
- * @param $uri
+ * @param string $uri
* A string containing the URI to the directory to delete.
- * @param $options
+ * @param int $options
* A bit mask of STREAM_REPORT_ERRORS.
*
- * @return
+ * @return bool
* TRUE if directory was successfully removed.
*
* @see http://php.net/manual/en/streamwrapper.rmdir.php
@@ -669,12 +457,12 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for stat().
*
- * @param $uri
+ * @param string $uri
* A string containing the URI to get information about.
- * @param $flags
+ * @param int $flags
* A bit mask of STREAM_URL_STAT_LINK and STREAM_URL_STAT_QUIET.
*
- * @return
+ * @return array
* An array with file status, or FALSE in case of an error - see fstat()
* for a description of this array.
*
@@ -696,12 +484,12 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for opendir().
*
- * @param $uri
+ * @param string $uri
* A string containing the URI to the directory to open.
- * @param $options
+ * @param int $options
* Unknown (parameter is not documented in PHP Manual).
*
- * @return
+ * @return bool
* TRUE on success.
*
* @see http://php.net/manual/en/streamwrapper.dir-opendir.php
@@ -716,7 +504,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for readdir().
*
- * @return
+ * @return string
* The next filename, or FALSE if there are no more files in the directory.
*
* @see http://php.net/manual/en/streamwrapper.dir-readdir.php
@@ -728,7 +516,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for rewinddir().
*
- * @return
+ * @return bool
* TRUE on success.
*
* @see http://php.net/manual/en/streamwrapper.dir-rewinddir.php
@@ -744,7 +532,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
/**
* Support for closedir().
*
- * @return
+ * @return bool
* TRUE on success.
*
* @see http://php.net/manual/en/streamwrapper.dir-closedir.php
@@ -756,81 +544,3 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
return TRUE;
}
}
-
-/**
- * Drupal public (public://) stream wrapper class.
- *
- * Provides support for storing publicly accessible files with the Drupal file
- * interface.
- */
-class DrupalPublicStreamWrapper extends DrupalLocalStreamWrapper {
- /**
- * Implements abstract public function getDirectoryPath()
- */
- public function getDirectoryPath() {
- return variable_get('file_public_path', conf_path() . '/files');
- }
-
- /**
- * Overrides getExternalUrl().
- *
- * Return the HTML URI of a public file.
- */
- function getExternalUrl() {
- $path = str_replace('\\', '/', $this->getTarget());
- return $GLOBALS['base_url'] . '/' . self::getDirectoryPath() . '/' . drupal_encode_path($path);
- }
-}
-
-
-/**
- * Drupal private (private://) stream wrapper class.
- *
- * Provides support for storing privately accessible files with the Drupal file
- * interface.
- *
- * Extends DrupalPublicStreamWrapper.
- */
-class DrupalPrivateStreamWrapper extends DrupalLocalStreamWrapper {
- /**
- * Implements abstract public function getDirectoryPath()
- */
- public function getDirectoryPath() {
- return variable_get('file_private_path', '');
- }
-
- /**
- * Overrides getExternalUrl().
- *
- * Return the HTML URI of a private file.
- */
- function getExternalUrl() {
- $path = str_replace('\\', '/', $this->getTarget());
- return url('system/files/' . $path, array('absolute' => TRUE));
- }
-}
-
-/**
- * Drupal temporary (temporary://) stream wrapper class.
- *
- * Provides support for storing temporarily accessible files with the Drupal
- * file interface.
- *
- * Extends DrupalPublicStreamWrapper.
- */
-class DrupalTemporaryStreamWrapper extends DrupalLocalStreamWrapper {
- /**
- * Implements abstract public function getDirectoryPath()
- */
- public function getDirectoryPath() {
- return variable_get('file_temporary_path', file_directory_temp());
- }
-
- /**
- * Overrides getExternalUrl().
- */
- public function getExternalUrl() {
- $path = str_replace('\\', '/', $this->getTarget());
- return url('system/temporary/' . $path, array('absolute' => TRUE));
- }
-}
diff --git a/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php
new file mode 100644
index 0000000..4cf41e0
--- /dev/null
+++ b/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php
@@ -0,0 +1,35 @@
+getTarget());
+ return url('system/files/' . $path, array('absolute' => TRUE));
+ }
+}
diff --git a/core/lib/Drupal/Core/StreamWrapper/PublicStream.php b/core/lib/Drupal/Core/StreamWrapper/PublicStream.php
new file mode 100644
index 0000000..207b77a
--- /dev/null
+++ b/core/lib/Drupal/Core/StreamWrapper/PublicStream.php
@@ -0,0 +1,35 @@
+getTarget());
+ return $GLOBALS['base_url'] . '/' . self::getDirectoryPath() . '/' . drupal_encode_path($path);
+ }
+}
diff --git a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
new file mode 100644
index 0000000..15ba2cf
--- /dev/null
+++ b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
@@ -0,0 +1,125 @@
+getTarget());
+ return url('system/temporary/' . $path, array('absolute' => TRUE));
+ }
+}
diff --git a/core/lib/Drupal/Core/Updater/Module.php b/core/lib/Drupal/Core/Updater/Module.php
new file mode 100644
index 0000000..eea11a6
--- /dev/null
+++ b/core/lib/Drupal/Core/Updater/Module.php
@@ -0,0 +1,113 @@
+name)) {
+ $relative_path = dirname($relative_path);
+ }
+ else {
+ $relative_path = 'sites/all/modules';
+ }
+ return DRUPAL_ROOT . '/' . $relative_path;
+ }
+
+ /**
+ * Implements Drupal\Core\Updater\UpdaterInterface::isInstalled().
+ */
+ public function isInstalled() {
+ return (bool) drupal_get_path('module', $this->name);
+ }
+
+ /**
+ * Implements Drupal\Core\Updater\UpdaterInterface::canUpdateDirectory().
+ */
+ public static function canUpdateDirectory($directory) {
+ if (file_scan_directory($directory, '/.*\.module$/')) {
+ return TRUE;
+ }
+ return FALSE;
+ }
+
+ /**
+ * Determines whether this class can update the specified project.
+ *
+ * @param string $project_name
+ * The project to check.
+ *
+ * @return bool
+ */
+ public static function canUpdate($project_name) {
+ return (bool) drupal_get_path('module', $project_name);
+ }
+
+ /**
+ * Returns available database schema updates once a new version is installed.
+ *
+ * @return array
+ */
+ public function getSchemaUpdates() {
+ require_once DRUPAL_ROOT . '/core/includes/install.inc';
+ require_once DRUPAL_ROOT . '/core/includes/update.inc';
+
+ if (!self::canUpdate($this->name)) {
+ return array();
+ }
+ module_load_include('install', $this->name);
+
+ if (!$updates = drupal_get_schema_versions($this->name)) {
+ return array();
+ }
+ $modules_with_updates = update_get_update_list();
+ if ($updates = $modules_with_updates[$this->name]) {
+ if ($updates['start']) {
+ return $updates['pending'];
+ }
+ }
+ return array();
+ }
+
+ /**
+ * Overrides Drupal\Core\Updater\Updater::postInstallTasks().
+ */
+ public function postInstallTasks() {
+ return array(
+ l(t('Enable newly added modules'), 'admin/modules'),
+ l(t('Administration pages'), 'admin'),
+ );
+ }
+
+ /**
+ * Overrides Drupal\Core\Updater\Updater::postUpdateTasks().
+ */
+ public function postUpdateTasks() {
+ // We don't want to check for DB updates here, we do that once for all
+ // updated modules on the landing page.
+ }
+}
diff --git a/core/lib/Drupal/Core/Updater/Theme.php b/core/lib/Drupal/Core/Updater/Theme.php
new file mode 100644
index 0000000..697fae8
--- /dev/null
+++ b/core/lib/Drupal/Core/Updater/Theme.php
@@ -0,0 +1,89 @@
+name)) {
+ $relative_path = dirname($relative_path);
+ }
+ else {
+ $relative_path = 'sites/all/themes';
+ }
+ return DRUPAL_ROOT . '/' . $relative_path;
+ }
+
+ /**
+ * Implements Drupal\Core\Updater\UpdaterInterface::isInstalled().
+ */
+ public function isInstalled() {
+ return (bool) drupal_get_path('theme', $this->name);
+ }
+
+ /**
+ * Implements Drupal\Core\Updater\UpdaterInterface::canUpdateDirectory().
+ */
+ static function canUpdateDirectory($directory) {
+ // This is a lousy test, but don't know how else to confirm it is a theme.
+ if (file_scan_directory($directory, '/.*\.module$/')) {
+ return FALSE;
+ }
+ return TRUE;
+ }
+
+ /**
+ * Determines whether this class can update the specified project.
+ *
+ * @param string $project_name
+ * The project to check.
+ *
+ * @return bool
+ */
+ public static function canUpdate($project_name) {
+ return (bool) drupal_get_path('theme', $project_name);
+ }
+
+ /**
+ * Overrides Drupal\Core\Updater\Updater::postInstall().
+ */
+ public function postInstall() {
+ // Update the system table.
+ clearstatcache();
+ system_rebuild_theme_data();
+ }
+
+ /**
+ * Overrides Drupal\Core\Updater\Updater::postInstallTasks().
+ */
+ public function postInstallTasks() {
+ return array(
+ l(t('Enable newly added themes'), 'admin/appearance'),
+ l(t('Administration pages'), 'admin'),
+ );
+ }
+}
diff --git a/core/includes/updater.inc b/core/lib/Drupal/Core/Updater/Updater.php
similarity index 74%
rename from core/includes/updater.inc
rename to core/lib/Drupal/Core/Updater/Updater.php
index d4f99e9..b7e5915 100644
--- a/core/includes/updater.inc
+++ b/core/lib/Drupal/Core/Updater/Updater.php
@@ -2,78 +2,29 @@
/**
* @file
- * Classes used for updating various files in the Drupal webroot. These
- * classes use a FileTransfer object to actually perform the operations.
- * Normally, the FileTransfer is provided when the site owner is redirected to
- * authorize.php as part of a multistep process.
+ * Definition of Drupal\Core\Updater\Updater.
*/
+namespace Drupal\Core\Updater;
+
/**
- * Interface for a class which can update a Drupal project.
- *
- * An Updater currently serves the following purposes:
- * - It can take a given directory, and determine if it can operate on it.
- * - It can move the contents of that directory into the appropriate place
- * on the system using FileTransfer classes.
- * - It can return a list of "next steps" after an update or install.
- * - In the future, it will most likely perform some of those steps as well.
+ * Defines the base class for Updaters used in Drupal.
*/
-interface DrupalUpdaterInterface {
-
- /**
- * Checks if the project is installed.
- *
- * @return bool
- */
- public function isInstalled();
+class Updater {
/**
- * Returns the system name of the project.
+ * Directory to install from.
*
- * @param string $directory
- * A directory containing a project.
- */
- public static function getProjectName($directory);
-
- /**
- * @return string
- * An absolute path to the default install location.
+ * @var string
*/
- public function getInstallDirectory();
+ public $source;
/**
- * Determine if the Updater can handle the project provided in $directory.
+ * Constructs a new updater.
*
- * @todo: Provide something more rational here, like a project spec file.
- *
- * @param string $directory
- *
- * @return bool
- * TRUE if the project is installed, FALSE if not.
- */
- public static function canUpdateDirectory($directory);
-
- /**
- * Actions to run after an install has occurred.
- */
- public function postInstall();
-
- /**
- * Actions to run after an update has occurred.
- */
- public function postUpdate();
-}
-
-/**
- * Base class for Updaters used in Drupal.
- */
-class Updater {
-
- /**
- * @var string $source Directory to install from.
+ * @param string $source
+ * Directory to install from.
*/
- public $source;
-
public function __construct($source) {
$this->source = $source;
$this->name = self::getProjectName($source);
@@ -81,7 +32,7 @@ class Updater {
}
/**
- * Return an Updater of the appropriate type depending on the source.
+ * Returns an Updater of the appropriate type depending on the source.
*
* If a directory is provided which contains a module, will return a
* ModuleUpdater.
@@ -89,7 +40,10 @@ class Updater {
* @param string $source
* Directory of a Drupal project.
*
- * @return Updater
+ * @return Drupal\Core\Updater\Updater
+ * A new Drupal\Core\Updater\Updater object.
+ *
+ * @throws Drupal\Core\Updater\UpdaterException
*/
public static function factory($source) {
if (is_dir($source)) {
@@ -102,13 +56,15 @@ class Updater {
}
/**
- * Determine which Updater class can operate on the given directory.
+ * Determines which Updater class can operate on the given directory.
*
* @param string $directory
* Extracted Drupal project.
*
* @return string
* The class name which can work with this project type.
+ *
+ * @throws Drupal\Core\Updater\UpdaterException
*/
public static function getUpdaterFromDirectory($directory) {
// Gets a list of possible implementing classes.
@@ -123,7 +79,7 @@ class Updater {
}
/**
- * Figure out what the most important (or only) info file is in a directory.
+ * Determines what the most important (or only) info file is in a directory.
*
* Since there is no enforcement of which info file is the project's "main"
* info file, this will get one with the same name as the directory, or the
@@ -152,7 +108,7 @@ class Updater {
}
/**
- * Get the name of the project directory (basename).
+ * Gets the name of the project directory (basename).
*
* @todo: It would be nice, if projects contained an info file which could
* provide their canonical name.
@@ -167,13 +123,15 @@ class Updater {
}
/**
- * Return the project name from a Drupal info file.
+ * Returns the project name from a Drupal info file.
*
* @param string $directory
* Directory to search for the info file.
*
* @return string
* The title of the project.
+ *
+ * @throws Drupal\Core\Updater\UpdaterException
*/
public static function getProjectTitle($directory) {
$info_file = self::findInfoFile($directory);
@@ -188,7 +146,7 @@ class Updater {
}
/**
- * Store the default parameters for the Updater.
+ * Stores the default parameters for the Updater.
*
* @param array $overrides
* An array of overrides for the default parameters.
@@ -206,9 +164,9 @@ class Updater {
}
/**
- * Updates a Drupal project, returns a list of next actions.
+ * Updates a Drupal project and returns a list of next actions.
*
- * @param FileTransfer $filetransfer
+ * @param Drupal\Core\FileTransfer\FileTransferInterface $filetransfer
* Object that is a child of FileTransfer. Used for moving files
* to the server.
* @param array $overrides
@@ -216,6 +174,9 @@ class Updater {
*
* @return array
* An array of links which the user may need to complete the update
+ *
+ * @throws Drupal\Core\Updater\UpdaterException
+ * @throws Drupal\Core\Updater\UpdaterFileTransferException
*/
public function update(&$filetransfer, $overrides = array()) {
try {
@@ -264,13 +225,15 @@ class Updater {
/**
* Installs a Drupal project, returns a list of next actions.
*
- * @param FileTransfer $filetransfer
+ * @param Drupal\Core\FileTransfer\FileTransferInterface $filetransfer
* Object that is a child of FileTransfer.
* @param array $overrides
* An array of settings to override defaults; see self::getInstallArgs().
*
* @return array
* An array of links which the user may need to complete the install.
+ *
+ * @throws Drupal\Core\Updater\UpdaterFileTransferException
*/
public function install(&$filetransfer, $overrides = array()) {
try {
@@ -298,12 +261,14 @@ class Updater {
}
/**
- * Make sure the installation parent directory exists and is writable.
+ * Makes sure the installation parent directory exists and is writable.
*
- * @param FileTransfer $filetransfer
+ * @param Drupal\Core\FileTransfer\FileTransferInterface $filetransfer
* Object which is a child of FileTransfer.
* @param string $directory
* The installation directory to prepare.
+ *
+ * @throws Drupal\Core\Updater\UpdaterException
*/
public function prepareInstallDirectory(&$filetransfer, $directory) {
// Make the parent dir writable if need be and create the dir.
@@ -341,9 +306,9 @@ class Updater {
}
/**
- * Ensure that a given directory is world readable.
+ * Ensures that a given directory is world readable.
*
- * @param FileTransfer $filetransfer
+ * @param Drupal\Core\FileTransfer\FileTransferInterface $filetransfer
* Object which is a child of FileTransfer.
* @param string $path
* The file path to make world readable.
@@ -359,7 +324,7 @@ class Updater {
}
/**
- * Perform a backup.
+ * Performs a backup.
*
* @todo Not implemented.
*/
@@ -367,26 +332,26 @@ class Updater {
}
/**
- * Return the full path to a directory where backups should be written.
+ * Returns the full path to a directory where backups should be written.
*/
public function getBackupDir() {
return file_stream_wrapper_get_instance_by_scheme('temporary')->getDirectoryPath();
}
/**
- * Perform actions after new code is updated.
+ * Performs actions after new code is updated.
*/
public function postUpdate() {
}
/**
- * Perform actions after installation.
+ * Performs actions after installation.
*/
public function postInstall() {
}
/**
- * Return an array of links to pages that should be visited post operation.
+ * Returns an array of links to pages that should be visited post operation.
*
* @return array
* Links which provide actions to take after the install is finished.
@@ -396,7 +361,7 @@ class Updater {
}
/**
- * Return an array of links to pages that should be visited post operation.
+ * Returns an array of links to pages that should be visited post operation.
*
* @return array
* Links which provide actions to take after the update is finished.
@@ -405,23 +370,3 @@ class Updater {
return array();
}
}
-
-/**
- * Exception class for the Updater class hierarchy.
- *
- * This is identical to the base Exception class, we just give it a more
- * specific name so that call sites that want to tell the difference can
- * specifically catch these exceptions and treat them differently.
- */
-class UpdaterException extends Exception {
-}
-
-/**
- * Child class of UpdaterException that indicates a FileTransfer exception.
- *
- * We have to catch FileTransfer exceptions and wrap those in t(), since
- * FileTransfer is so low-level that it doesn't use any Drupal APIs and none
- * of the strings are translated.
- */
-class UpdaterFileTransferException extends UpdaterException {
-}
diff --git a/core/lib/Drupal/Core/Updater/UpdaterException.php b/core/lib/Drupal/Core/Updater/UpdaterException.php
new file mode 100644
index 0000000..fc9cb9d
--- /dev/null
+++ b/core/lib/Drupal/Core/Updater/UpdaterException.php
@@ -0,0 +1,19 @@
+context = $context;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @api
+ */
+ public function match($pathinfo) {
+
+ $this->allow = array();
+
+ // Symfony uses a prefixing / but we don't yet.
+ $dpathinfo = ltrim($pathinfo, '/');
+
+ // Temporary BC shiv to support automated tests that still rely on old-
+ // style dirty URLs.
+ // @todo Remove this once testbot knows how to deal with Symfony-style
+ // dirty URLs.
+ if (isset($_GET['q'])) {
+ $dpathinfo = $_GET['q'];
+ $pathinfo = '/' . $dpathinfo;
+ }
+
+ // Do our fancy frontpage logic.
+ if (empty($dpathinfo)) {
+ $dpathinfo = variable_get('site_frontpage', 'user');
+ $pathinfo = '/' . $dpathinfo;
+ }
+
+ if ($router_item = $this->matchDrupalItem($dpathinfo)) {
+
+ $routes = new RouteCollection();
+ $routes->add(hash('sha256', $router_item['path']), $this->convertDrupalItem($router_item));
+
+ if ($ret = $this->matchCollection($pathinfo, $routes)) {
+ //drupal_set_message('' . var_export('test', TRUE) . '');
+ // Stash the router item in the attributes while we're transitioning.
+ $ret['drupal_menu_item'] = $router_item;
+
+ // Most legacy controllers (aka page callbacks) are in a separate file,
+ // so we have to include that.
+ if ($router_item['include_file']) {
+ require_once DRUPAL_ROOT . '/' . $router_item['include_file'];
+ }
+
+ return $ret;
+ }
+ }
+
+ throw 0 < count($this->allow)
+ ? new MethodNotAllowedException(array_unique(array_map('strtoupper', $this->allow)))
+ : new ResourceNotFoundException();
+ }
+
+ /**
+ * Get a drupal menu item.
+ *
+ * @todo Make this return multiple possible candidates for the resolver to
+ * consider.
+ *
+ * @param string $path
+ * The path being looked up by
+ */
+ protected function matchDrupalItem($path) {
+ // For now we can just proxy our procedural method. At some point this will
+ // become more complicated because we'll need to get back candidates for a
+ // path and them resolve them based on things like method and scheme which
+ // we currently can't do.
+ return menu_get_item($path);
+ }
+
+ protected function convertDrupalItem($router_item) {
+ $route = array(
+ '_controller' => $router_item['page_callback']
+ );
+ // Place argument defaults on the route.
+ foreach ($router_item['page_arguments'] as $k => $v) {
+ $route[$k] = $v;
+ }
+ return new Route($router_item['href'], $route);
+ }
+}
diff --git a/core/lib/Drupal/Core/Utility/CacheArray.php b/core/lib/Drupal/Core/Utility/CacheArray.php
new file mode 100644
index 0000000..8f98b72
--- /dev/null
+++ b/core/lib/Drupal/Core/Utility/CacheArray.php
@@ -0,0 +1,210 @@
+ 'baz'), but later
+ * want to change the value of 'bar' from 'baz' to 'foobar', you cannot do so
+ * a targeted write like $object['foo']['bar'] = 'foobar'. Instead, you must
+ * overwrite the entire top-level 'foo' array with the entire set of new
+ * values: $object['foo'] = array(1, 2, 'bar' => 'foobar'). Due to this same
+ * limitation, attempts to create references to any contained data, nested or
+ * otherwise, will fail silently. So $var = &$object['foo'] will not throw an
+ * error, and $var will be populated with the contents of $object['foo'], but
+ * that data will be passed by value, not reference. For more information on
+ * the PHP limitation, see the note in the official PHP documentation atá
+ * http://php.net/manual/en/arrayaccess.offsetget.php on
+ * ArrayAccess::offsetGet().
+ *
+ * By default, the class accounts for caches where calling functions might
+ * request keys in the array that won't exist even after a cache rebuild. This
+ * prevents situations where a cache rebuild would be triggered over and over
+ * due to a 'missing' item. These cases are stored internally as a value of
+ * NULL. This means that the offsetGet() and offsetExists() methods
+ * must be overridden if caching an array where the top level values can
+ * legitimately be NULL, and where $object->offsetExists() needs to correctly
+ * return (equivalent to array_key_exists() vs. isset()). This should not
+ * be necessary in the majority of cases.
+ *
+ * Classes extending this class must override at least the
+ * resolveCacheMiss() method to have a working implementation.
+ *
+ * offsetSet() is not overridden by this class by default. In practice this
+ * means that assigning an offset via arrayAccess will only apply while the
+ * object is in scope and will not be written back to the persistent cache.
+ * This follows a similar pattern to static vs. persistent caching in
+ * procedural code. Extending classes may wish to alter this behaviour, for
+ * example by overriding offsetSet() and adding an automatic call to persist().
+ *
+ * @see SchemaCache
+ */
+abstract class CacheArray implements ArrayAccess {
+
+ /**
+ * A cid to pass to cache()->set() and cache()->get().
+ */
+ protected $cid;
+
+ /**
+ * A bin to pass to cache()->set() and cache()->get().
+ */
+ protected $bin;
+
+ /**
+ * An array of keys to add to the cache at the end of the request.
+ */
+ protected $keysToPersist = array();
+
+ /**
+ * Storage for the data itself.
+ */
+ protected $storage = array();
+
+ /**
+ * Constructs a DrupalCacheArray object.
+ *
+ * @param $cid
+ * The cid for the array being cached.
+ * @param $bin
+ * The bin to cache the array.
+ */
+ public function __construct($cid, $bin) {
+ $this->cid = $cid;
+ $this->bin = $bin;
+
+ if ($cached = cache($bin)->get($this->cid)) {
+ $this->storage = $cached->data;
+ }
+ }
+
+ /**
+ * Implements ArrayAccess::offsetExists().
+ */
+ public function offsetExists($offset) {
+ return $this->offsetGet($offset) !== NULL;
+ }
+
+ /**
+ * Implements ArrayAccess::offsetGet().
+ */
+ public function offsetGet($offset) {
+ if (isset($this->storage[$offset]) || array_key_exists($offset, $this->storage)) {
+ return $this->storage[$offset];
+ }
+ else {
+ return $this->resolveCacheMiss($offset);
+ }
+ }
+
+ /**
+ * Implements ArrayAccess::offsetSet().
+ */
+ public function offsetSet($offset, $value) {
+ $this->storage[$offset] = $value;
+ }
+
+ /**
+ * Implements ArrayAccess::offsetUnset().
+ */
+ public function offsetUnset($offset) {
+ unset($this->storage[$offset]);
+ }
+
+ /**
+ * Flags an offset value to be written to the persistent cache.
+ *
+ * If a value is assigned to a cache object with offsetSet(), by default it
+ * will not be written to the persistent cache unless it is flagged with this
+ * method. This allows items to be cached for the duration of a request,
+ * without necessarily writing back to the persistent cache at the end.
+ *
+ * @param $offset
+ * The array offset that was request.
+ * @param $persist
+ * Optional boolean to specify whether the offset should be persisted or
+ * not, defaults to TRUE. When called with $persist = FALSE the offset will
+ * be unflagged so that it will not written at the end of the request.
+ */
+ protected function persist($offset, $persist = TRUE) {
+ $this->keysToPersist[$offset] = $persist;
+ }
+
+ /**
+ * Resolves a cache miss.
+ *
+ * When an offset is not found in the object, this is treated as a cache
+ * miss. This method allows classes implementing the interface to look up
+ * the actual value and allow it to be cached.
+ *
+ * @param $offset
+ * The offset that was requested.
+ *
+ * @return
+ * The value of the offset, or NULL if no value was found.
+ */
+ abstract protected function resolveCacheMiss($offset);
+
+ /**
+ * Writes a value to the persistent cache immediately.
+ *
+ * @param $data
+ * The data to write to the persistent cache.
+ * @param $lock
+ * Whether to acquire a lock before writing to cache.
+ */
+ protected function set($data, $lock = TRUE) {
+ // Lock cache writes to help avoid stampedes.
+ // To implement locking for cache misses, override __construct().
+ $lock_name = $this->cid . ':' . $this->bin;
+ if (!$lock || lock_acquire($lock_name)) {
+ if ($cached = cache($this->bin)->get($this->cid)) {
+ $data = $cached->data + $data;
+ }
+ cache($this->bin)->set($this->cid, $data);
+ if ($lock) {
+ lock_release($lock_name);
+ }
+ }
+ }
+
+ /**
+ * Destructs the DrupalCacheArray object.
+ */
+ public function __destruct() {
+ $data = array();
+ foreach ($this->keysToPersist as $offset => $persist) {
+ if ($persist) {
+ $data[$offset] = $this->storage[$offset];
+ }
+ }
+ if (!empty($data)) {
+ $this->set($data);
+ }
+ }
+}
diff --git a/core/lib/Drupal/Core/Utility/SchemaCache.php b/core/lib/Drupal/Core/Utility/SchemaCache.php
new file mode 100644
index 0000000..d8c3a50
--- /dev/null
+++ b/core/lib/Drupal/Core/Utility/SchemaCache.php
@@ -0,0 +1,35 @@
+storage[$offset] = $value;
+ $this->persist($offset);
+ return $value;
+ }
+}
diff --git a/core/misc/autocomplete.js b/core/misc/autocomplete.js
index 2f4e5f6..122f05d 100644
--- a/core/misc/autocomplete.js
+++ b/core/misc/autocomplete.js
@@ -293,10 +293,11 @@ Drupal.ACDB.prototype.search = function (searchString) {
this.timer = setTimeout(function () {
db.owner.setStatus('begin');
- // Ajax GET request for autocompletion.
+ // Ajax GET request for autocompletion. We use Drupal.encodePath instead of
+ // encodeURIComponent to allow autocomplete search terms to contain slashes.
$.ajax({
type: 'GET',
- url: db.uri + '/' + encodeURIComponent(searchString),
+ url: db.uri + '/' + Drupal.encodePath(searchString),
dataType: 'json',
success: function (matches) {
if (typeof matches.status === 'undefined' || matches.status !== 0) {
diff --git a/core/misc/machine-name.js b/core/misc/machine-name.js
index 4f1be3b..ced8c4b 100644
--- a/core/misc/machine-name.js
+++ b/core/misc/machine-name.js
@@ -19,6 +19,10 @@ Drupal.behaviors.machineName = {
* disallowed characters in the machine name; e.g., '[^a-z0-9]+'.
* - replace: A character to replace disallowed characters with; e.g., '_'
* or '-'.
+ * - standalone: Whether the preview should stay in its own element rather
+ * than the suffix of the source element.
+ * - field_prefix: The #field_prefix of the form element.
+ * - field_suffix: The #field_suffix of the form element.
*/
attach: function (context, settings) {
var self = this;
@@ -49,10 +53,12 @@ Drupal.behaviors.machineName = {
var machine = self.transliterate($source.val(), options);
}
// Append the machine name preview to the source field.
- var $preview = $('' + machine + '');
- $suffix.empty()
- .append(' ').append('' + options.label + ':')
- .append(' ').append($preview);
+ var $preview = $('' + options.field_prefix + Drupal.checkPlain(machine) + options.field_suffix + '');
+ $suffix.empty();
+ if (options.label) {
+ $suffix.append(' ').append('' + options.label + ':');
+ }
+ $suffix.append(' ').append($preview);
// If the machine name cannot be edited, stop further processing.
if ($target.is(':disabled')) {
@@ -80,7 +86,7 @@ Drupal.behaviors.machineName = {
if (machine != '') {
if (machine != options.replace) {
$target.val(machine);
- $preview.text(machine);
+ $preview.html(options.field_prefix + Drupal.checkPlain(machine) + options.field_suffix);
}
$suffix.show();
}
diff --git a/core/misc/powered-black-135x42.png b/core/misc/powered-black-135x42.png
deleted file mode 100644
index 1ac2a87..0000000
Binary files a/core/misc/powered-black-135x42.png and /dev/null differ
diff --git a/core/misc/powered-black-80x15.png b/core/misc/powered-black-80x15.png
deleted file mode 100644
index e76fa03..0000000
Binary files a/core/misc/powered-black-80x15.png and /dev/null differ
diff --git a/core/misc/powered-black-88x31.png b/core/misc/powered-black-88x31.png
deleted file mode 100644
index 3adaa4f..0000000
Binary files a/core/misc/powered-black-88x31.png and /dev/null differ
diff --git a/core/misc/powered-blue-135x42.png b/core/misc/powered-blue-135x42.png
deleted file mode 100644
index 21e0521..0000000
Binary files a/core/misc/powered-blue-135x42.png and /dev/null differ
diff --git a/core/misc/powered-blue-80x15.png b/core/misc/powered-blue-80x15.png
deleted file mode 100644
index 28f8bc5..0000000
Binary files a/core/misc/powered-blue-80x15.png and /dev/null differ
diff --git a/core/misc/powered-blue-88x31.png b/core/misc/powered-blue-88x31.png
deleted file mode 100644
index e6e3086..0000000
Binary files a/core/misc/powered-blue-88x31.png and /dev/null differ
diff --git a/core/misc/powered-gray-135x42.png b/core/misc/powered-gray-135x42.png
deleted file mode 100644
index 7bbfcc6..0000000
Binary files a/core/misc/powered-gray-135x42.png and /dev/null differ
diff --git a/core/misc/powered-gray-80x15.png b/core/misc/powered-gray-80x15.png
deleted file mode 100644
index 80808ad..0000000
Binary files a/core/misc/powered-gray-80x15.png and /dev/null differ
diff --git a/core/misc/powered-gray-88x31.png b/core/misc/powered-gray-88x31.png
deleted file mode 100644
index a618d83..0000000
Binary files a/core/misc/powered-gray-88x31.png and /dev/null differ
diff --git a/core/misc/textarea.js b/core/misc/textarea.js
deleted file mode 100644
index 0ab5e71..0000000
--- a/core/misc/textarea.js
+++ /dev/null
@@ -1,32 +0,0 @@
-(function ($) {
-
-Drupal.behaviors.textarea = {
- attach: function (context, settings) {
- $('.form-textarea-wrapper.resizable', context).once('textarea', function () {
- var staticOffset = null;
- var textarea = $(this).addClass('resizable-textarea').find('textarea');
- var grippie = $('').mousedown(startDrag);
-
- grippie.insertAfter(textarea);
-
- function startDrag(e) {
- staticOffset = textarea.height() - e.pageY;
- textarea.css('opacity', 0.25);
- $(document).mousemove(performDrag).mouseup(endDrag);
- return false;
- }
-
- function performDrag(e) {
- textarea.height(Math.max(32, staticOffset + e.pageY) + 'px');
- return false;
- }
-
- function endDrag(e) {
- $(document).unbind('mousemove', performDrag).unbind('mouseup', endDrag);
- textarea.css('opacity', 1);
- }
- });
- }
-};
-
-})(jQuery);
diff --git a/core/misc/vertical-tabs.js b/core/misc/vertical-tabs.js
index 82dcd2c..14d0660 100644
--- a/core/misc/vertical-tabs.js
+++ b/core/misc/vertical-tabs.js
@@ -92,16 +92,6 @@ Drupal.verticalTab = function (settings) {
}
});
- // Pressing the Enter key lets you leave the tab again.
- this.fieldset.keydown(function(event) {
- // Enter key should not trigger inside