(stable) Promote 2019 Week 20

externals/httpful/.gitignore

@@ -1,4 +0,0 @@
-.DS_Store
-composer.lock
-vendor
-downloads

externals/httpful/.travis.yml

@@ -1,5 +0,0 @@
-language: php
-before_script: cd tests
-php:
-  - 5.3
-  - 5.4

externals/httpful/LICENSE.txt

@@ -1,7 +0,0 @@
-Copyright (c) 2012 Nate Good <me@nategood.com>
-
-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.

externals/httpful/README.md

@@ -1,137 +0,0 @@
-# Httpful
-
-[![Build Status](https://secure.travis-ci.org/nategood/httpful.png?branch=master)](http://travis-ci.org/nategood/httpful)
-
-[Httpful](http://phphttpclient.com) is a simple Http Client library for PHP 5.3+.  There is an emphasis of readability, simplicity, and flexibility – basically provide the features and flexibility to get the job done and make those features really easy to use.
-
-Features
-
- - Readable HTTP Method Support (GET, PUT, POST, DELETE, HEAD, PATCH and OPTIONS)
- - Custom Headers
- - Automatic "Smart" Parsing
- - Automatic Payload Serialization
- - Basic Auth
- - Client Side Certificate Auth
- - Request "Templates"
-
-# Sneak Peak
-
-Here's something to whet your appetite.  Search the twitter API for tweets containing "#PHP".  Include a trivial header for the heck of it.  Notice that the library automatically interprets the response as JSON (can override this if desired) and parses it as an array of objects.
-
-    $url = "http://search.twitter.com/search.json?q=" . urlencode('#PHP');
-    $response = Request::get($url)
-        ->withXTrivialHeader('Just as a demo')
-        ->send();
-
-    foreach ($response->body->results as $tweet) {
-        echo "@{$tweet->from_user} tweets \"{$tweet->text}\"\n";
-    }
-
-# Installation
-
-## Phar
-
-A [PHP Archive](http://php.net/manual/en/book.phar.php) (or .phar) file is available for [downloading](https://github.com/nategood/httpful/downloads).  Simply [download](https://github.com/nategood/httpful/downloads) the .phar, drop it into your project, and include it like you would any other php file.  _This method is ideal smaller projects, one off scripts, and quick API hacking_.
-
-    <?php
-    include('httpful.phar');
-    $r = \Httpful\Request::get($uri)->sendIt();
-    ...
-
-## Composer
-
-Httpful is PSR-0 compliant and can be installed using [composer](http://getcomposer.org/).  Simply add `nategood/httpful` to your composer.json file.  _Composer is the sane alternative to PEAR.  It is excellent for managing dependancies in larger projects_.
-
-    {
-        "require": {
-            "nategood/httpful": "*"
-        }
-    }
-
-## Install from Source
-
-Because Httpful is PSR-0 compliant, you can also just clone the Httpful repository and use a PSR-0 compatible autoloader to load the library, like [Symfony's](http://symfony.com/doc/current/components/class_loader.html). Alternatively you can use the PSR-0 compliant autoloader included with the Httpful (simply `require("bootstrap.php")`).
-
-# Show Me More!
-
-You can checkout the [Httpful Landing Page](http://phphttpclient.com) for more info including many examples and  [documentation](http:://phphttpclient.com/docs).
-
-# Contributing
-
-Httpful highly encourages sending in pull requests.  When submitting a pull request please:
-
- - All pull requests should target the `dev` branch (not `master`)
- - Make sure your code follows the [coding conventions](http://pear.php.net/manual/en/standards.php)
- - Please use soft tabs (four spaces) instead of hard tabs
- - Make sure you add appropriate test coverage for your changes
- - Run all unit tests in the test directory via `phpunit ./tests`
- - Include commenting where appropriate and add a descriptive pull request message
-
-# Changelog
-
-## 0.2.3
-
- - FIX Overriding default Mime Handlers
- - FIX [PR #73](https://github.com/nategood/httpful/pull/73) Parsing http status codes
-
-## 0.2.2
-
- - FEATURE Add support for parsing JSON responses as associative arrays instead of objects
- - FEATURE Better support for setting constructor arguments on Mime Handlers
-
-## 0.2.1
-
- - FEATURE [PR #72](https://github.com/nategood/httpful/pull/72) Allow support for custom Accept header
-
-## 0.2.0
-
- - REFACTOR [PR #49](https://github.com/nategood/httpful/pull/49) Broke headers out into their own class
- - REFACTOR [PR #54](https://github.com/nategood/httpful/pull/54) Added more specific Exceptions
- - FIX [PR #58](https://github.com/nategood/httpful/pull/58) Fixes throwing an error on an empty xml response
- - FEATURE [PR #57](https://github.com/nategood/httpful/pull/57) Adds support for digest authentication
-
-## 0.1.6
-
- - Ability to set the number of max redirects via overloading `followRedirects(int max_redirects)`
- - Standards Compliant fix to `Accepts` header
- - Bug fix for bootstrap process when installed via Composer
-
-## 0.1.5
-
- - Use `DIRECTORY_SEPARATOR` constant [PR #33](https://github.com/nategood/httpful/pull/32)
- - [PR #35](https://github.com/nategood/httpful/pull/35)
- - Added the raw\_headers property reference to response.
- - Compose request header and added raw\_header to Request object.
- - Fixed response has errors and added more comments for clarity.
- - Fixed header parsing to allow the minimum (status line only) and also cater for the actual CRLF ended headers as per RFC2616.
- - Added the perfect test Accept: header for all Acceptable scenarios see  @b78e9e82cd9614fbe137c01bde9439c4e16ca323 for details.
- - Added default User-Agent header
-  - `User-Agent: Httpful/0.1.5` + curl version + server software + PHP version
- - To bypass this "default" operation simply add a User-Agent to the request headers even a blank User-Agent is sufficient and more than simple enough to produce me thinks.
- - Completed test units for additions.
- - Added phpunit coverage reporting and helped phpunit auto locate the tests a bit easier.
-
-## 0.1.4
-
- - Add support for CSV Handling [PR #32](https://github.com/nategood/httpful/pull/32)
-
-## 0.1.3
-
- - Handle empty responses in JsonParser and XmlParser
-
-## 0.1.2
-
- - Added support for setting XMLHandler configuration options
- - Added examples for overriding XmlHandler and registering a custom parser
- - Removed the httpful.php download (deprecated in favor of httpful.phar)
-
-## 0.1.1
-
- - Bug fix serialization default case and phpunit tests
-
-## 0.1.0
-
- - Added Support for Registering Mime Handlers
-  - Created AbstractMimeHandler type that all Mime Handlers must extend
-  - Pulled out the parsing/serializing logic from the Request/Response classes into their own MimeHandler classes
-  - Added ability to register new mime handlers for mime types

externals/httpful/bootstrap.php

@@ -1,4 +0,0 @@
-<?php
-
-require(__DIR__ . '/src/Httpful/Bootstrap.php');
-\Httpful\Bootstrap::init();

externals/httpful/build

@@ -1,51 +0,0 @@
-#!/usr/bin/php
-<?php
-
-/**
- * Build the whole library into a single file
- * as an easy drop in solution as opposed to
- * relying on autoloader.  Sometimes we just
- * want to hack with an API as a one off thing.
- * Httpful should make this easy.
- */
-
-function exit_unless($condition, $msg = null) {
-    if ($condition)
-        return;
-    echo "[FAIL]\n$msg\n";
-    exit(1);
-}
-
-// Create the Httpful Phar
-echo "Building Phar... ";
-$base_dir = dirname(__FILE__);
-$source_dir = $base_dir . '/src/Httpful/';
-$phar_path = $base_dir . '/downloads/httpful.phar';
-$phar = new Phar($phar_path, 0, 'httpful.phar');
-$stub = <<<HEREDOC
-<?php
-    // Phar Stub File
-    Phar::mapPhar('httpful.phar');
-    include('phar://httpful.phar/Httpful/Bootstrap.php');
-    \Httpful\Bootstrap::pharInit();
-
-    __HALT_COMPILER();
-HEREDOC;
-try {
-    $phar->setStub($stub);
-} catch(Exception $e) {
-    $phar = false;
-}
-exit_unless($phar, "Unable to create a phar.  Make certain you have phar.readonly=0 set in your ini file.");
-$phar->buildFromDirectory(dirname($source_dir));
-echo "[ OK ]\n";
-
-
-
-// Add it to git!
-echo "Adding httpful.phar to the repo... ";
-$return_code = 0;
-passthru("git add $phar_path", $return_code);
-exit_unless($return_code === 0, "Unable to add download files to git.");
-echo "[ OK ]\n";
-echo "\nBuild completed sucessfully.\n\n";

externals/httpful/composer.json

@@ -1,24 +0,0 @@
-{
-    "name": "nategood/httpful",
-    "description": "A Readable, Chainable, REST friendly, PHP HTTP Client",
-    "homepage": "http://github.com/nategood/httpful",
-    "license": "MIT",
-    "keywords": ["http", "curl", "rest", "restful", "api", "requests"],
-    "version": "0.2.3",
-    "authors": [
-        {
-            "name": "Nate Good",
-            "email": "me@nategood.com",
-            "homepage": "http://nategood.com"
-        }
-    ],
-    "require": {
-        "php": ">=5.3",
-        "ext-curl": "*"
-    },
-    "autoload": {
-        "psr-0": {
-            "Httpful": "src/"
-        }
-    }
-}

externals/httpful/examples/freebase.php

@@ -1,12 +0,0 @@
-<?php
-/**
- * Grab some The Dead Weather albums from Freebase
- */
-require(__DIR__ . '/../bootstrap.php');
-
-$uri = "https://www.googleapis.com/freebase/v1/mqlread?query=%7B%22type%22:%22/music/artist%22%2C%22name%22:%22The%20Dead%20Weather%22%2C%22album%22:%5B%5D%7D";
-$response = \Httpful\Request::get($uri)
-    ->expectsJson()
-    ->sendIt();
-
-echo 'The Dead Weather has ' . count($response->body->result->album) . " albums.\n";

externals/httpful/examples/github.php

@@ -1,9 +0,0 @@
-<?php
-// XML Example from GitHub
-require(__DIR__ . '/../bootstrap.php');
-use \Httpful\Request;
-
-$uri = 'https://github.com/api/v2/xml/user/show/nategood';
-$request = Request::get($uri)->send();
-
-echo "{$request->body->name} joined GitHub on " . date('M jS', strtotime($request->body->{'created-at'})) ."\n";

externals/httpful/examples/override.php

@@ -1,44 +0,0 @@
-<?php
-require(__DIR__ . '/../bootstrap.php');
-
-// We can override the default parser configuration options be registering
-// a parser with different configuration options for a particular mime type
-
-// Example setting a namespace for the XMLHandler parser
-$conf = array('namespace' => 'http://example.com');
-\Httpful\Httpful::register(\Httpful\Mime::XML, new \Httpful\Handlers\XmlHandler($conf));
-
-// We can also add the parsers with our own...
-class SimpleCsvHandler extends \Httpful\Handlers\MimeHandlerAdapter
-{
-    /**
-     * Takes a response body, and turns it into
-     * a two dimensional array.
-     *
-     * @param string $body
-     * @return mixed
-     */
-    public function parse($body)
-    {
-        return str_getcsv($body);
-    }
-
-    /**
-     * Takes a two dimensional array and turns it
-     * into a serialized string to include as the
-     * body of a request
-     *
-     * @param mixed $payload
-     * @return string
-     */
-    public function serialize($payload)
-    {
-        $serialized = '';
-        foreach ($payload as $line) {
-            $serialized .= '"' . implode('","', $line) . '"' . "\n";
-        }
-        return $serialized;
-    }
-}
-
-\Httpful\Httpful::register('text/csv', new SimpleCsvHandler());

externals/httpful/examples/showclix.php

@@ -1,24 +0,0 @@
-<?php
-
-require(__DIR__ . '/../bootstrap.php');
-
-use \Httpful\Request;
-
-// Get event details for a public event
-$uri = "http://api.showclix.com/Event/8175";
-$response = Request::get($uri)
-    ->expectsType('json')
-    ->sendIt();
-
-// Print out the event details
-echo "The event {$response->body->event} will take place on {$response->body->event_start}\n";
-
-// Example overriding the default JSON handler with one that encodes the response as an array
-\Httpful\Httpful::register(\Httpful\Mime::JSON, new \Httpful\Handlers\JsonHandler(array('decode_as_array' => true)));
-
-$response = Request::get($uri)
-    ->expectsType('json')
-    ->sendIt();
-
-// Print out the event details
-echo "The event {$response->body['event']} will take place on {$response->body['event_start']}\n";

externals/httpful/examples/twitter.php

@@ -1,13 +0,0 @@
-<?php
-require(__DIR__ . '/../bootstrap.php');
-
-$query = urlencode('#PHP');
-$response = \Httpful\Request::get("http://search.twitter.com/search.json?q=$query")->send();
-
-if (!$response->hasErrors()) {
-    foreach ($response->body->results as $tweet) {
-        echo "@{$tweet->from_user} tweets \"{$tweet->text}\"\n";
-    }
-} else {
-    echo "Uh oh.  Twitter gave us the old {$response->code} status.\n";
-}

externals/httpful/src/Httpful/Bootstrap.php

@@ -1,97 +0,0 @@
-<?php
-
-namespace Httpful;
-
-/**
- * Bootstrap class that facilitates autoloading.  A naive
- * PSR-0 autoloader.
- *
- * @author Nate Good <me@nategood.com>
- */
-class Bootstrap
-{
-
-    const DIR_GLUE = DIRECTORY_SEPARATOR;
-    const NS_GLUE = '\\';
-
-    public static $registered = false;
-
-    /**
-     * Register the autoloader and any other setup needed
-     */
-    public static function init()
-    {
-        spl_autoload_register(array('\Httpful\Bootstrap', 'autoload'));
-        self::registerHandlers();
-    }
-
-    /**
-     * The autoload magic (PSR-0 style)
-     *
-     * @param string $classname
-     */
-    public static function autoload($classname)
-    {
-        self::_autoload(dirname(dirname(__FILE__)), $classname);
-    }
-
-    /**
-     * Register the autoloader and any other setup needed
-     */
-    public static function pharInit()
-    {
-        spl_autoload_register(array('\Httpful\Bootstrap', 'pharAutoload'));
-        self::registerHandlers();
-    }
-
-    /**
-     * Phar specific autoloader
-     *
-     * @param string $classname
-     */
-    public static function pharAutoload($classname)
-    {
-        self::_autoload('phar://httpful.phar', $classname);
-    }
-
-    /**
-     * @param string base
-     * @param string classname
-     */
-    private static function _autoload($base, $classname)
-    {
-        $parts      = explode(self::NS_GLUE, $classname);
-        $path       = $base . self::DIR_GLUE . implode(self::DIR_GLUE, $parts) . '.php';
-
-        if (file_exists($path)) {
-            require_once($path);
-        }
-    }
-    /**
-     * Register default mime handlers.  Is idempotent.
-     */
-    public static function registerHandlers()
-    {
-        if (self::$registered === true) {
-            return;
-        }
-
-        // @todo check a conf file to load from that instead of
-        // hardcoding into the library?
-        $handlers = array(
-            \Httpful\Mime::JSON => new \Httpful\Handlers\JsonHandler(),
-            \Httpful\Mime::XML  => new \Httpful\Handlers\XmlHandler(),
-            \Httpful\Mime::FORM => new \Httpful\Handlers\FormHandler(),
-            \Httpful\Mime::CSV  => new \Httpful\Handlers\CsvHandler(),
-        );
-
-        foreach ($handlers as $mime => $handler) {
-            // Don't overwrite if the handler has already been registered
-            if (Httpful::hasParserRegistered($mime))
-                continue;
-            Httpful::register($mime, $handler);
-        }
-
-        self::$registered = true;
-    }
-}

externals/httpful/src/Httpful/Exception/ConnectionErrorException.php

@@ -1,7 +0,0 @@
-<?php 
-
-namespace Httpful\Exception;
-
-class ConnectionErrorException extends \Exception 
-{
-}

externals/httpful/src/Httpful/Handlers/CsvHandler.php

@@ -1,50 +0,0 @@
-<?php
-/**
- * Mime Type: text/csv
- * @author Raja Kapur <rajak@twistedthrottle.com>
- */
-
-namespace Httpful\Handlers;
-
-class CsvHandler extends MimeHandlerAdapter
-{
-    /**
-     * @param string $body
-     * @return mixed
-     */
-    public function parse($body)
-    {
-        if (empty($body))
-            return null;
-
-        $parsed = array();
-        $fp = fopen('data://text/plain;base64,' . base64_encode($body), 'r');
-        while (($r = fgetcsv($fp)) !== FALSE) {
-            $parsed[] = $r;
-        }
-
-        if (empty($parsed))
-            throw new \Exception("Unable to parse response as CSV");
-        return $parsed;
-    }
-
-    /**
-     * @param mixed $payload
-     * @return string
-     */
-    public function serialize($payload)
-    {
-        $fp = fopen('php://temp/maxmemory:'. (6*1024*1024), 'r+');
-        $i = 0;
-        foreach ($payload as $fields) {
-            if($i++ == 0) {
-                fputcsv($fp, array_keys($fields));
-            }
-            fputcsv($fp, $fields);
-        }
-        rewind($fp);
-        $data = stream_get_contents($fp);
-        fclose($fp);
-        return $data;
-    }
-}

externals/httpful/src/Httpful/Handlers/FormHandler.php

@@ -1,30 +0,0 @@
-<?php
-/**
- * Mime Type: application/x-www-urlencoded
- * @author Nathan Good <me@nategood.com>
- */
-
-namespace Httpful\Handlers;
-
-class FormHandler extends MimeHandlerAdapter 
-{
-    /**
-     * @param string $body
-     * @return mixed
-     */
-    public function parse($body)
-    {
-        $parsed = array();
-        parse_str($body, $parsed);
-        return $parsed;
-    }
-    
-    /**
-     * @param mixed $payload
-     * @return string
-     */
-    public function serialize($payload)
-    {
-        return http_build_query($payload, null, '&');
-    }
-}

externals/httpful/src/Httpful/Handlers/JsonHandler.php

@@ -1,40 +0,0 @@
-<?php
-/**
- * Mime Type: application/json
- * @author Nathan Good <me@nategood.com>
- */
-
-namespace Httpful\Handlers;
-
-class JsonHandler extends MimeHandlerAdapter
-{
-    private $decode_as_array = false;
-
-    public function init(array $args)
-    {
-        $this->decode_as_array = !!(array_key_exists('decode_as_array', $args) ? $args['decode_as_array'] : false);
-    }
-
-    /**
-     * @param string $body
-     * @return mixed
-     */
-    public function parse($body)
-    {
-        if (empty($body))
-            return null;
-        $parsed = json_decode($body, $this->decode_as_array);
-        if (is_null($parsed))
-            throw new \Exception("Unable to parse response as JSON");
-        return $parsed;
-    }
-
-    /**
-     * @param mixed $payload
-     * @return string
-     */
-    public function serialize($payload)
-    {
-        return json_encode($payload);
-    }
-}

externals/httpful/src/Httpful/Handlers/MimeHandlerAdapter.php

@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Handlers are used to parse and serialize payloads for specific
- * mime types.  You can register a custom handler via the register
- * method.  You can also override a default parser in this way.
- */
-
-namespace Httpful\Handlers;
-
-class MimeHandlerAdapter
-{
-    public function __construct(array $args = array())
-    {
-        $this->init($args);
-    }
-
-    /**
-     * Initial setup of
-     * @param array $args
-     */
-    public function init(array $args)
-    {
-    }
-
-    /**
-     * @param string $body
-     * @return mixed
-     */
-    public function parse($body)
-    {
-        return $body;
-    }
-
-    /**
-     * @param mixed $payload
-     * @return string
-     */
-    function serialize($payload)
-    {
-        return (string) $payload;
-    }
-}

externals/httpful/src/Httpful/Handlers/README.md

@@ -1,44 +0,0 @@
-# Handlers
-
-Handlers are simple classes that are used to parse response bodies and serialize request payloads.  All Handlers must extend the `MimeHandlerAdapter` class and implement two methods: `serialize($payload)` and `parse($response)`.  Let's build a very basic Handler to register for the `text/csv` mime type.
-
-    <?php
-
-    class SimpleCsvHandler extends \Httpful\Handlers\MimeHandlerAdapter
-    {
-        /**
-         * Takes a response body, and turns it into 
-         * a two dimensional array.
-         *
-         * @param string $body
-         * @return mixed
-         */
-        public function parse($body)
-        {
-            return str_getcsv($body);
-        }
-    
-        /**
-         * Takes a two dimensional array and turns it
-         * into a serialized string to include as the 
-         * body of a request
-         *
-         * @param mixed $payload
-         * @return string
-         */
-        public function serialize($payload)
-        {
-            $serialized = '';
-            foreach ($payload as $line) {
-                $serialized .= '"' . implode('","', $line) . '"' . "\n";
-            }
-            return $serialized;
-        }
-    }
-
-
-Finally, you must register this handler for a particular mime type.
-
-    Httpful::register('text/csv', new SimpleCsvHandler());
-
-After this registering the handler in your source code, by default, any responses with a mime type of text/csv should be parsed by this handler.

externals/httpful/src/Httpful/Handlers/XHtmlHandler.php

@@ -1,15 +0,0 @@
-<?php
-/**
- * Mime Type: text/html
- * Mime Type: application/html+xml
- *
- * @author Nathan Good <me@nategood.com>
- */
-
-namespace Httpful\Handlers;
-
-class XHtmlHandler extends MimeHandlerAdapter
-{
-    // @todo add html specific parsing
-    // see DomDocument::load http://docs.php.net/manual/en/domdocument.loadhtml.php
-}

externals/httpful/src/Httpful/Handlers/XmlHandler.php

@@ -1,120 +0,0 @@
-<?php
-/**
- * Mime Type: application/xml
- *
- * @author Zack Douglas <zack@zackerydouglas.info>
- * @author Nathan Good <me@nategood.com>
- */
-
-namespace Httpful\Handlers;
-
-class XmlHandler extends MimeHandlerAdapter
-{
-    /**
-     *  @var string $namespace xml namespace to use with simple_load_string
-     */
-    private $namespace;
-
-    /**
-     * @var int $libxml_opts see http://www.php.net/manual/en/libxml.constants.php
-     */
-    private $libxml_opts;
-
-    /**
-     * @param array $conf sets configuration options
-     */
-    public function __construct(array $conf = array())
-    {
-        $this->namespace =      isset($conf['namespace']) ? $conf['namespace'] : '';
-        $this->libxml_opts =    isset($conf['libxml_opts']) ? $conf['libxml_opts'] : 0;
-    }
-
-    /**
-     * @param string $body
-     * @return mixed
-     * @throws Exception if unable to parse
-     */
-    public function parse($body)
-    {
-        if (empty($body))
-            return null;
-        $parsed = simplexml_load_string($body, null, $this->libxml_opts, $this->namespace);
-        if ($parsed === false)
-            throw new \Exception("Unable to parse response as XML");
-        return $parsed;
-    }
-
-    /**
-     * @param mixed $payload
-     * @return string
-     * @throws Exception if unable to serialize
-     */
-    public function serialize($payload)
-    {
-        list($_, $dom) = $this->_future_serializeAsXml($payload);
-        return $dom->saveXml();
-    }
-
-    /**
-     * @author Zack Douglas <zack@zackerydouglas.info>
-     */
-    private function _future_serializeAsXml($value, $node = null, $dom = null)
-    {
-        if (!$dom) {
-            $dom = new \DOMDocument;
-        }
-        if (!$node) {
-            if (!is_object($value)) {
-                $node = $dom->createElement('response');
-                $dom->appendChild($node);
-            } else {
-                $node = $dom;
-            }
-        }
-        if (is_object($value)) {
-            $objNode = $dom->createElement(get_class($value));
-            $node->appendChild($objNode);
-            $this->_future_serializeObjectAsXml($value, $objNode, $dom);
-        } else if (is_array($value)) {
-            $arrNode = $dom->createElement('array');
-            $node->appendChild($arrNode);
-            $this->_future_serializeArrayAsXml($value, $arrNode, $dom);
-        } else if (is_bool($value)) {
-            $node->appendChild($dom->createTextNode($value?'TRUE':'FALSE'));
-        } else {
-            $node->appendChild($dom->createTextNode($value));
-        }
-        return array($node, $dom);
-    }
-    /**
-     * @author Zack Douglas <zack@zackerydouglas.info>
-     */
-    private function _future_serializeArrayAsXml($value, &$parent, &$dom)
-    {
-        foreach ($value as $k => &$v) {
-            $n = $k;
-            if (is_numeric($k)) {
-                $n = "child-{$n}";
-            }
-            $el = $dom->createElement($n);
-            $parent->appendChild($el);
-            $this->_future_serializeAsXml($v, $el, $dom);
-        }
-        return array($parent, $dom);
-    }
-    /**
-     * @author Zack Douglas <zack@zackerydouglas.info>
-     */
-    private function _future_serializeObjectAsXml($value, &$parent, &$dom)
-    {
-        $refl = new \ReflectionObject($value);
-        foreach ($refl->getProperties() as $pr) {
-            if (!$pr->isPrivate()) {
-                $el = $dom->createElement($pr->getName());
-                $parent->appendChild($el);
-                $this->_future_serializeAsXml($pr->getValue($value), $el, $dom);
-            }
-        }
-        return array($parent, $dom);
-    }
-}

externals/httpful/src/Httpful/Http.php

@@ -1,86 +0,0 @@
-<?php
-
-namespace Httpful;
-
-/**
- * @author Nate Good <me@nategood.com>
- */
-class Http
-{
-    const HEAD      = 'HEAD';
-    const GET       = 'GET';
-    const POST      = 'POST';
-    const PUT       = 'PUT';
-    const DELETE    = 'DELETE';
-    const PATCH     = 'PATCH';
-    const OPTIONS   = 'OPTIONS';
-    const TRACE     = 'TRACE';
-
-    /**
-     * @return array of HTTP method strings
-     */
-    public static function safeMethods()
-    {
-        return array(self::HEAD, self::GET, self::OPTIONS, self::TRACE);
-    }
-
-    /**
-     * @return bool
-     * @param string HTTP method
-     */
-    public static function isSafeMethod($method)
-    {
-        return in_array($method, self::safeMethods());
-    }
-
-    /**
-     * @return bool
-     * @param string HTTP method
-     */
-    public static function isUnsafeMethod($method)
-    {
-        return !in_array($method, self::safeMethods());
-    }
-
-    /**
-     * @return array list of (always) idempotent HTTP methods
-     */
-    public static function idempotentMethods()
-    {
-        // Though it is possible to be idempotent, POST
-        // is not guarunteed to be, and more often than
-        // not, it is not.
-        return array(self::HEAD, self::GET, self::PUT, self::DELETE, self::OPTIONS, self::TRACE, self::PATCH);
-    }
-
-    /**
-     * @return bool
-     * @param string HTTP method
-     */
-    public static function isIdempotent($method)
-    {
-        return in_array($method, self::safeidempotentMethodsMethods());
-    }
-
-    /**
-     * @return bool
-     * @param string HTTP method
-     */
-    public static function isNotIdempotent($method)
-    {
-        return !in_array($method, self::idempotentMethods());
-    }
-
-    /**
-     * @deprecated Technically anything *can* have a body,
-     * they just don't have semantic meaning.  So say's Roy
-     * http://tech.groups.yahoo.com/group/rest-discuss/message/9962
-     *
-     * @return array of HTTP method strings
-     */
-    public static function canHaveBody()
-    {
-        return array(self::POST, self::PUT, self::PATCH, self::OPTIONS);
-    }
-
-}

externals/httpful/src/Httpful/Httpful.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace Httpful;
-
-class Httpful {
-    const VERSION = '0.1.7';
-
-    private static $mimeRegistrar = array();
-    private static $default = null;
-
-    /**
-     * @param string $mime_type
-     * @param MimeHandlerAdapter $handler
-     */
-    public static function register($mimeType, \Httpful\Handlers\MimeHandlerAdapter $handler)
-    {
-        self::$mimeRegistrar[$mimeType] = $handler;
-    }
-
-    /**
-     * @param string $mime_type defaults to MimeHandlerAdapter
-     * @return MimeHandlerAdapter
-     */
-    public static function get($mimeType = null)
-    {
-        if (isset(self::$mimeRegistrar[$mimeType])) {
-            return self::$mimeRegistrar[$mimeType];
-        }
-
-        if (empty(self::$default)) {
-            self::$default = new \Httpful\Handlers\MimeHandlerAdapter();
-        }
-
-        return self::$default;
-    }
-
-    /**
-     * Does this particular Mime Type have a parser registered
-     * for it?
-     * @return bool
-     */
-    public static function hasParserRegistered($mimeType)
-    {
-        return isset(self::$mimeRegistrar[$mimeType]);
-    }
-}

externals/httpful/src/Httpful/Mime.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace Httpful;
-
-/**
- * Class to organize the Mime stuff a bit more
- * @author Nate Good <me@nategood.com>
- */
-class Mime
-{
-    const JSON  = 'application/json';
-    const XML   = 'application/xml';
-    const XHTML = 'application/html+xml';
-    const FORM  = 'application/x-www-form-urlencoded';
-    const PLAIN = 'text/plain';
-    const JS    = 'text/javascript';
-    const HTML  = 'text/html';
-    const YAML  = 'application/x-yaml';
-    const CSV   = 'text/csv';
-
-    /**
-     * Map short name for a mime type
-     * to a full proper mime type
-     */
-    public static $mimes = array(
-        'json'      => self::JSON,
-        'xml'       => self::XML,
-        'form'      => self::FORM,
-        'plain'     => self::PLAIN,
-        'text'      => self::PLAIN,
-        'html'      => self::HTML,
-        'xhtml'     => self::XHTML,
-        'js'        => self::JS,
-        'javascript'=> self::JS,
-        'yaml'      => self::YAML,
-        'csv'       => self::CSV,
-    );
-
-    /**
-     * Get the full Mime Type name from a "short name".
-     * Returns the short if no mapping was found.
-     * @return string full mime type (e.g. application/json)
-     * @param string common name for mime type (e.g. json)
-     */
-    public static function getFullMime($short_name)
-    {
-        return array_key_exists($short_name, self::$mimes) ? self::$mimes[$short_name] : $short_name;
-    }
-
-    /**
-     * @return bool
-     * @param string $short_name
-     */
-    public static function supportsMimeType($short_name)
-    {
-        return array_key_exists($short_name, self::$mimes);
-    }
-}

externals/httpful/src/Httpful/Request.php

@@ -1,984 +0,0 @@
-<?php
-
-namespace Httpful;
-
-use Httpful\Exception\ConnectionErrorException;
-
-/**
- * Clean, simple class for sending HTTP requests
- * in PHP.
- *
- * There is an emphasis of readability without loosing concise
- * syntax.  As such, you will notice that the library lends
- * itself very nicely to "chaining".  You will see several "alias"
- * methods: more readable method definitions that wrap
- * their more concise counterparts.  You will also notice
- * no public constructor.  This two adds to the readability
- * and "chainabilty" of the library.
- *
- * @author Nate Good <me@nategood.com>
- */
-class Request
-{
-
-    // Option constants
-    const SERIALIZE_PAYLOAD_NEVER   = 0;
-    const SERIALIZE_PAYLOAD_ALWAYS  = 1;
-    const SERIALIZE_PAYLOAD_SMART   = 2;
-
-    const MAX_REDIRECTS_DEFAULT     = 25;
-
-    public $uri,
-           $method                  = Http::GET,
-           $headers                 = array(),
-           $raw_headers             = '',
-           $strict_ssl              = false,
-           $content_type,
-           $expected_type,
-           $additional_curl_opts    = array(),
-           $auto_parse              = true,
-           $serialize_payload_method = self::SERIALIZE_PAYLOAD_SMART,
-           $username,
-           $password,
-           $serialized_payload,
-           $payload,
-           $parse_callback,
-           $error_callback,
-           $follow_redirects        = false,
-           $max_redirects           = self::MAX_REDIRECTS_DEFAULT,
-           $payload_serializers     = array();
-
-    // Options
-    // private $_options = array(
-    //     'serialize_payload_method' => self::SERIALIZE_PAYLOAD_SMART
-    //     'auto_parse' => true
-    // );
-
-    // Curl Handle
-    public $_ch,
-           $_debug;
-
-    // Template Request object
-    private static $_template;
-
-    /**
-     * We made the constructor private to force the factory style.  This was
-     * done to keep the syntax cleaner and better the support the idea of
-     * "default templates".  Very basic and flexible as it is only intended
-     * for internal use.
-     * @param array $attrs hash of initial attribute values
-     */
-    private function __construct($attrs = null)
-    {
-        if (!is_array($attrs)) return;
-        foreach ($attrs as $attr => $value) {
-            $this->$attr = $value;
-        }
-    }
-
-    // Defaults Management
-
-    /**
-     * Let's you configure default settings for this
-     * class from a template Request object.  Simply construct a
-     * Request object as much as you want to and then pass it to
-     * this method.  It will then lock in those settings from
-     * that template object.
-     * The most common of which may be default mime
-     * settings or strict ssl settings.
-     * Again some slight memory overhead incurred here but in the grand
-     * scheme of things as it typically only occurs once
-     * @param Request $template
-     */
-    public static function ini(Request $template)
-    {
-        self::$_template = clone $template;
-    }
-
-    /**
-     * Reset the default template back to the
-     * library defaults.
-     */
-    public static function resetIni()
-    {
-        self::_initializeDefaults();
-    }
-
-    /**
-     * Get default for a value based on the template object
-     * @return mixed default value
-     * @param string|null $attr Name of attribute (e.g. mime, headers)
-     *    if null just return the whole template object;
-     */
-    public static function d($attr)
-    {
-        return isset($attr) ? self::$_template->$attr : self::$_template;
-    }
-
-    // Accessors
-
-    /**
-     * @return bool does the request have a timeout?
-     */
-    public function hasTimeout()
-    {
-        return isset($this->timeout);
-    }
-
-    /**
-     * @return bool has the internal curl request been initialized?
-     */
-    public function hasBeenInitialized()
-    {
-        return isset($this->_ch);
-    }
-
-    /**
-     * @return bool Is this request setup for basic auth?
-     */
-    public function hasBasicAuth()
-    {
-        return isset($this->password) && isset($this->username);
-    }
-
-    /**
-     * @return bool Is this request setup for digest auth?
-     */
-    public function hasDigestAuth()
-    {
-        return isset($this->password) && isset($this->username) && $this->additional_curl_opts['CURLOPT_HTTPAUTH'] = CURLAUTH_DIGEST;
-    }    
-
-    /**
-     * Specify a HTTP timeout
-     * @return Request $this
-     * @param |int $timeout seconds to timeout the HTTP call
-     */
-    public function timeout($timeout)
-    {
-        $this->timeout = $timeout;
-        return $this;
-    }
-
-    /**
-     * If the response is a 301 or 302 redirect, automatically
-     * send off another request to that location
-     * @return Request $this
-     * @param bool|int $follow follow or not to follow or maximal number of redirects
-     */
-    public function followRedirects($follow = true)
-    {
-        $this->max_redirects = $follow === true ? self::MAX_REDIRECTS_DEFAULT : max(0, $follow);
-        $this->follow_redirects = (bool) $follow;
-        return $this;
-    }
-
-    /**
-     * @return Request $this
-     * @see Request::followRedirects()
-     */
-    public function doNotFollowRedirects()
-    {
-        return $this->followRedirects(false);
-    }
-
-    /**
-     * Actually send off the request, and parse the response
-     * @return string|associative array of parsed results
-     * @throws ConnectionErrorException when unable to parse or communicate w server
-     */
-    public function send()
-    {
-        if (!$this->hasBeenInitialized())
-            $this->_curlPrep();
-
-        $result = curl_exec($this->_ch);
-
-        if ($result === false) {
-            $this->_error(curl_error($this->_ch));
-            throw new ConnectionErrorException('Unable to connect.');
-        }
-
-        $info = curl_getinfo($this->_ch);
-        $response = explode("\r\n\r\n", $result, 2 + $info['redirect_count']);
-
-        $body = array_pop($response);
-        $headers = array_pop($response);
-
-        return new Response($body, $headers, $this);
-    }
-    public function sendIt()
-    {
-        return $this->send();
-    }
-
-    // Setters
-
-    /**
-     * @return Request this
-     * @param string $uri
-     */
-    public function uri($uri)
-    {
-        $this->uri = $uri;
-        return $this;
-    }
-
-    /**
-     * User Basic Auth.
-     * Only use when over SSL/TSL/HTTPS.
-     * @return Request this
-     * @param string $username
-     * @param string $password
-     */
-    public function basicAuth($username, $password)
-    {
-        $this->username = $username;
-        $this->password = $password;
-        return $this;
-    }
-    // @alias of basicAuth
-    public function authenticateWith($username, $password)
-    {
-        return $this->basicAuth($username, $password);
-    }
-    // @alias of basicAuth
-    public function authenticateWithBasic($username, $password)
-    {
-        return $this->basicAuth($username, $password);
-    }
-
-    /**
-     * User Digest Auth.
-     * @return Request this
-     * @param string $username
-     * @param string $password
-     */
-    public function digestAuth($username, $password)
-    {
-        $this->addOnCurlOption(CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
-        return $this->basicAuth($username, $password);
-    }
-
-    // @alias of digestAuth
-    public function authenticateWithDigest($username, $password)
-    {
-        return $this->digestAuth($username, $password);
-    } 
-
-    /**
-     * @return is this request setup for client side cert?
-     */
-    public function hasClientSideCert() {
-        return isset($this->client_cert) && isset($this->client_key);
-    }
-
-    /**
-     * Use Client Side Cert Authentication
-     * @return Response $this
-     * @param string $key file path to client key
-     * @param string $cert file path to client cert
-     * @param string $passphrase for client key
-     * @param string $encoding default PEM
-     */
-    public function clientSideCert($cert, $key, $passphrase = null, $encoding = 'PEM')
-    {
-        $this->client_cert          = $cert;
-        $this->client_key           = $key;
-        $this->client_passphrase    = $passphrase;
-        $this->client_encoding      = $encoding;
-
-        return $this;
-    }
-    // @alias of basicAuth
-    public function authenticateWithCert($cert, $key, $passphrase = null, $encoding = 'PEM')
-    {
-        return $this->clientSideCert($cert, $key, $passphrase, $encoding);
-    }
-
-    /**
-     * Set the body of the request
-     * @return Request this
-     * @param mixed $payload
-     * @param string $mimeType
-     */
-    public function body($payload, $mimeType = null)
-    {
-        $this->mime($mimeType);
-        $this->payload = $payload;
-        // Iserntentially don't call _serializePayload yet.  Wait until
-        // we actually send off the request to convert payload to string.
-        // At that time, the `serialized_payload` is set accordingly.
-        return $this;
-    }
-
-    /**
-     * Helper function to set the Content type and Expected as same in
-     * one swoop
-     * @return Request this
-     * @param string $mime mime type to use for content type and expected return type
-     */
-    public function mime($mime)
-    {
-        if (empty($mime)) return $this;
-        $this->content_type = $this->expected_type = Mime::getFullMime($mime);
-        return $this;
-    }
-    // @alias of mime
-    public function sendsAndExpectsType($mime)
-    {
-        return $this->mime($mime);
-    }
-    // @alias of mime
-    public function sendsAndExpects($mime)
-    {
-        return $this->mime($mime);
-    }
-
-    /**
-     * Set the method.  Shouldn't be called often as the preferred syntax
-     * for instantiation is the method specific factory methods.
-     * @return Request this
-     * @param string $method
-     */
-    public function method($method)
-    {
-        if (empty($method)) return $this;
-        $this->method = $method;
-        return $this;
-    }
-
-    /**
-     * @return Request this
-     * @param string $mime
-     */
-    public function expects($mime)
-    {
-        if (empty($mime)) return $this;
-        $this->expected_type = Mime::getFullMime($mime);
-        return $this;
-    }
-    // @alias of expects
-    public function expectsType($mime)
-    {
-        return $this->expects($mime);
-    }
-
-    /**
-     * @return Request this
-     * @param string $mime
-     */
-    public function contentType($mime)
-    {
-        if (empty($mime)) return $this;
-        $this->content_type  = Mime::getFullMime($mime);
-        return $this;
-    }
-    // @alias of contentType
-    public function sends($mime)
-    {
-        return $this->contentType($mime);
-    }
-    // @alias of contentType
-    public function sendsType($mime)
-    {
-        return $this->contentType($mime);
-    }
-
-    /**
-     * Do we strictly enforce SSL verification?
-     * @return Request this
-     * @param bool $strict
-     */
-    public function strictSSL($strict)
-    {
-        $this->strict_ssl = $strict;
-        return $this;
-    }
-    public function withoutStrictSSL()
-    {
-        return $this->strictSSL(false);
-    }
-    public function withStrictSSL()
-    {
-        return $this->strictSSL(true);
-    }
-
-    /**
-     * Determine how/if we use the built in serialization by
-     * setting the serialize_payload_method
-     * The default (SERIALIZE_PAYLOAD_SMART) is...
-     *  - if payload is not a scalar (object/array)
-     *    use the appropriate serialize method according to
-     *    the Content-Type of this request.
-     *  - if the payload IS a scalar (int, float, string, bool)
-     *    than just return it as is.
-     * When this option is set SERIALIZE_PAYLOAD_ALWAYS,
-     * it will always use the appropriate
-     * serialize option regardless of whether payload is scalar or not
-     * When this option is set SERIALIZE_PAYLOAD_NEVER,
-     * it will never use any of the serialization methods.
-     * Really the only use for this is if you want the serialize methods
-     * to handle strings or not (e.g. Blah is not valid JSON, but "Blah"
-     * is).  Forcing the serialization helps prevent that kind of error from
-     * happening.
-     * @return Request $this
-     * @param int $mode
-     */
-    public function serializePayload($mode)
-    {
-        $this->serialize_payload_method = $mode;
-        return $this;
-    }
-
-    /**
-     * @see Request::serializePayload()
-     * @return Request
-     */
-    public function neverSerializePayload()
-    {
-        return $this->serializePayload(self::SERIALIZE_PAYLOAD_NEVER);
-    }
-
-    /**
-     * This method is the default behavior
-     * @see Request::serializePayload()
-     * @return Request
-     */
-    public function smartSerializePayload()
-    {
-        return $this->serializePayload(self::SERIALIZE_PAYLOAD_SMART);
-    }
-
-    /**
-     * @see Request::serializePayload()
-     * @return Request
-     */
-    public function alwaysSerializePayload()
-    {
-        return $this->serializePayload(self::SERIALIZE_PAYLOAD_ALWAYS);
-    }
-
-    /**
-     * Add an additional header to the request
-     * Can also use the cleaner syntax of
-     * $Request->withMyHeaderName($my_value);
-     * @see Request::__call()
-     *
-     * @return Request this
-     * @param string $header_name
-     * @param string $value
-     */
-    public function addHeader($header_name, $value)
-    {
-        $this->headers[$header_name] = $value;
-        return $this;
-    }
-
-    /**
-     * Add group of headers all at once.  Note: This is
-     * here just as a convenience in very specific cases.
-     * The preferred "readable" way would be to leverage
-     * the support for custom header methods.
-     * @return Response $this
-     * @param array $headers
-     */
-    public function addHeaders(array $headers)
-    {
-        foreach ($headers as $header => $value) {
-            $this->addHeader($header, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * @return Request
-     * @param bool $auto_parse perform automatic "smart"
-     *    parsing based on Content-Type or "expectedType"
-     *    If not auto parsing, Response->body returns the body
-     *    as a string.
-     */
-    public function autoParse($auto_parse = true)
-    {
-        $this->auto_parse = $auto_parse;
-        return $this;
-    }
-
-    /**
-     * @see Request::autoParse()
-     * @return Request
-     */
-    public function withoutAutoParsing()
-    {
-        return $this->autoParse(false);
-    }
-
-    /**
-     * @see Request::autoParse()
-     * @return Request
-     */
-    public function withAutoParsing()
-    {
-        return $this->autoParse(true);
-    }
-
-    /**
-     * Use a custom function to parse the response.
-     * @return Request this
-     * @param \Closure $callback Takes the raw body of
-     *    the http response and returns a mixed
-     */
-    public function parseWith(\Closure $callback)
-    {
-        $this->parse_callback = $callback;
-        return $this;
-    }
-
-    /**
-     * @see Request::parseResponsesWith()
-     * @return Request $this
-     * @param \Closure $callback
-     */
-    public function parseResponsesWith(\Closure $callback)
-    {
-        return $this->parseWith($callback);
-    }
-
-    /**
-     * Register a callback that will be used to serialize the payload
-     * for a particular mime type.  When using "*" for the mime
-     * type, it will use that parser for all responses regardless of the mime
-     * type.  If a custom '*' and 'application/json' exist, the custom
-     * 'application/json' would take precedence over the '*' callback.
-     *
-     * @return Request $this
-     * @param string $mime mime type we're registering
-     * @param Closure $callback takes one argument, $payload,
-     *    which is the payload that we'll be
-     */
-    public function registerPayloadSerializer($mime, \Closure $callback)
-    {
-        $this->payload_serializers[Mime::getFullMime($mime)] = $callback;
-        return $this;
-    }
-
-    /**
-     * @see Request::registerPayloadSerializer()
-     * @return Request $this
-     * @param Closure $callback
-     */
-    public function serializePayloadWith(\Closure $callback)
-    {
-        return $this->regregisterPayloadSerializer('*', $callback);
-    }
-
-    /**
-     * Magic method allows for neatly setting other headers in a
-     * similar syntax as the other setters.  This method also allows
-     * for the sends* syntax.
-     * @return Request this
-     * @param string $method "missing" method name called
-     *    the method name called should be the name of the header that you
-     *    are trying to set in camel case without dashes e.g. to set a
-     *    header for Content-Type you would use contentType() or more commonly
-     *    to add a custom header like X-My-Header, you would use xMyHeader().
-     *    To promote readability, you can optionally prefix these methods with
-     *    "with"  (e.g. withXMyHeader("blah") instead of xMyHeader("blah")).
-     * @param array $args in this case, there should only ever be 1 argument provided
-     *    and that argument should be a string value of the header we're setting
-     */
-    public function __call($method, $args)
-    {
-        // This method supports the sends* methods
-        // like sendsJSON, sendsForm
-        //!method_exists($this, $method) &&
-        if (substr($method, 0, 5) === 'sends') {
-            $mime = strtolower(substr($method, 5));
-            if (Mime::supportsMimeType($mime)) {
-                $this->sends(Mime::getFullMime($mime));
-                return $this;
-            }
-            // else {
-            //     throw new \Exception("Unsupported Content-Type $mime");
-            // }
-        }
-        if (substr($method, 0, 7) === 'expects') {
-            $mime = strtolower(substr($method, 7));
-            if (Mime::supportsMimeType($mime)) {
-                $this->expects(Mime::getFullMime($mime));
-                return $this;
-            }
-            // else {
-            //     throw new \Exception("Unsupported Content-Type $mime");
-            // }
-        }
-
-        // This method also adds the custom header support as described in the
-        // method comments
-        if (count($args) === 0)
-            return;
-
-        // Strip the sugar.  If it leads with "with", strip.
-        // This is okay because: No defined HTTP headers begin with with,
-        // and if you are defining a custom header, the standard is to prefix it
-        // with an "X-", so that should take care of any collisions.
-        if (substr($method, 0, 4) === 'with')
-            $method = substr($method, 4);
-
-        // Precede upper case letters with dashes, uppercase the first letter of method
-        $header = ucwords(implode('-', preg_split('/([A-Z][^A-Z]*)/', $method, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY)));
-        $this->addHeader($header, $args[0]);
-        return $this;
-    }
-
-    // Internal Functions
-
-    /**
-     * This is the default template to use if no
-     * template has been provided.  The template
-     * tells the class which default values to use.
-     * While there is a slight overhead for object
-     * creation once per execution (not once per
-     * Request instantiation), it promotes readability
-     * and flexibility within the class.
-     */
-    private static function _initializeDefaults()
-    {
-        // This is the only place you will
-        // see this constructor syntax.  It
-        // is only done here to prevent infinite
-        // recusion.  Do not use this syntax elsewhere.
-        // It goes against the whole readability
-        // and transparency idea.
-        self::$_template = new Request(array('method' => Http::GET));
-
-        // This is more like it...
-        self::$_template
-            ->withoutStrictSSL();
-    }
-
-    /**
-     * Set the defaults on a newly instantiated object
-     * Doesn't copy variables prefixed with _
-     * @return Request this
-     */
-    private function _setDefaults()
-    {
-        if (!isset(self::$_template))
-            self::_initializeDefaults();
-        foreach (self::$_template as $k=>$v) {
-            if ($k[0] != '_')
-                $this->$k = $v;
-        }
-        return $this;
-    }
-
-    private function _error($error)
-    {
-        // Default actions write to error log
-        // TODO add in support for various Loggers
-        error_log($error);
-    }
-
-    /**
-     * Factory style constructor works nicer for chaining.  This
-     * should also really only be used internally.  The Request::get,
-     * Request::post syntax is preferred as it is more readable.
-     * @return Request
-     * @param string $method Http Method
-     * @param string $mime Mime Type to Use
-     */
-    public static function init($method = null, $mime = null)
-    {
-        // Setup our handlers, can call it here as it's idempotent
-        Bootstrap::init();
-
-        // Setup the default template if need be
-        if (!isset(self::$_template))
-            self::_initializeDefaults();
-
-        $request = new Request();
-        return $request
-               ->_setDefaults()
-               ->method($method)
-               ->sendsType($mime)
-               ->expectsType($mime);
-    }
-
-    /**
-     * Does the heavy lifting.  Uses de facto HTTP
-     * library cURL to set up the HTTP request.
-     * Note: It does NOT actually send the request
-     * @return Request $this;
-     */
-    public function _curlPrep()
-    {
-        // Check for required stuff
-        if (!isset($this->uri))
-            throw new \Exception('Attempting to send a request before defining a URI endpoint.');
-
-        $ch = curl_init($this->uri);
-
-        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->method);
-
-        if ($this->hasBasicAuth()) {
-            curl_setopt($ch, CURLOPT_USERPWD, $this->username . ':' . $this->password);
-        }
-
-        if ($this->hasClientSideCert()) {
-
-            if (!file_exists($this->client_key))
-                throw new \Exception('Could not read Client Key');
-
-            if (!file_exists($this->client_cert))
-                throw new \Exception('Could not read Client Certificate');
-
-            curl_setopt($ch, CURLOPT_SSLCERTTYPE,   $this->client_encoding);
-            curl_setopt($ch, CURLOPT_SSLKEYTYPE,    $this->client_encoding);
-            curl_setopt($ch, CURLOPT_SSLCERT,       $this->client_cert);
-            curl_setopt($ch, CURLOPT_SSLKEY,        $this->client_key);
-            curl_setopt($ch, CURLOPT_SSLKEYPASSWD,  $this->client_passphrase);
-            // curl_setopt($ch, CURLOPT_SSLCERTPASSWD,  $this->client_cert_passphrase);
-        }
-
-        if ($this->hasTimeout()) {
-            curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
-        }
-        
-        if ($this->follow_redirects) {
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-            curl_setopt($ch, CURLOPT_MAXREDIRS, $this->max_redirects);
-        }
-
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $this->strict_ssl);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-        $headers = array();
-        // https://github.com/nategood/httpful/issues/37
-        // Except header removes any HTTP 1.1 Continue from response headers
-        $headers[] = 'Expect:';
-
-        if (!isset($this->headers['User-Agent'])) {
-            $headers[] = $this->buildUserAgent();
-        }
-
-        $headers[] = "Content-Type: {$this->content_type}";
-
-        // allow custom Accept header if set
-        if (!isset($this->headers['Accept'])) {
-            // http://pretty-rfc.herokuapp.com/RFC2616#header.accept
-            $accept = 'Accept: */*; q=0.5, text/plain; q=0.8, text/html;level=3;';
-
-            if (!empty($this->expected_type)) {
-                $accept .= "q=0.9, {$this->expected_type}";
-            }
-
-            $headers[] = $accept;
-        }
-
-        foreach ($this->headers as $header => $value) {
-            $headers[] = "$header: $value";
-        }
-
-        $url = \parse_url($this->uri);
-        $path = (isset($url['path']) ? $url['path'] : '/').(isset($url['query']) ? '?'.$url['query'] : '');
-        $this->raw_headers = "{$this->method} $path HTTP/1.1\r\n";
-        $host = (isset($url['host']) ? $url['host'] : 'localhost').(isset($url['port']) ? ':'.$url['port'] : '');
-        $this->raw_headers .= "Host: $host\r\n";
-        $this->raw_headers .= \implode("\r\n", $headers);
-        $this->raw_headers .= "\r\n";
-
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-
-        if (isset($this->payload)) {
-            $this->serialized_payload = $this->_serializePayload($this->payload);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $this->serialized_payload);
-        }
-
-        if ($this->_debug) {
-            curl_setopt($ch, CURLOPT_VERBOSE, true);
-        }
-
-        curl_setopt($ch, CURLOPT_HEADER, 1);
-
-        // If there are some additional curl opts that the user wants
-        // to set, we can tack them in here
-        foreach ($this->additional_curl_opts as $curlopt => $curlval) {
-            curl_setopt($ch, $curlopt, $curlval);
-        }
-
-        $this->_ch = $ch;
-
-        return $this;
-    }
-
-    public function buildUserAgent() {
-        $user_agent = 'User-Agent: Httpful/' . Httpful::VERSION . ' (cURL/';
-        $curl = \curl_version();
-
-        if (isset($curl['version'])) {
-            $user_agent .= $curl['version'];
-        } else {
-            $user_agent .= '?.?.?';
-        }
-
-        $user_agent .= ' PHP/'. PHP_VERSION . ' (' . PHP_OS . ')';
-
-        if (isset($_SERVER['SERVER_SOFTWARE'])) {
-            $user_agent .= ' ' . \preg_replace('~PHP/[\d\.]+~U', '',
-                $_SERVER['SERVER_SOFTWARE']);
-        } else {
-            if (isset($_SERVER['TERM_PROGRAM'])) {
-                $user_agent .= " {$_SERVER['TERM_PROGRAM']}";
-            }
-
-            if (isset($_SERVER['TERM_PROGRAM_VERSION'])) {
-                $user_agent .= "/{$_SERVER['TERM_PROGRAM_VERSION']}";
-            }
-        }
-
-        if (isset($_SERVER['HTTP_USER_AGENT'])) {
-            $user_agent .= " {$_SERVER['HTTP_USER_AGENT']}";
-        }
-
-        $user_agent .= ')';
-
-        return $user_agent;
-    }
-
-    /**
-     * Semi-reluctantly added this as a way to add in curl opts
-     * that are not otherwise accessible from the rest of the API.
-     * @return Request $this
-     * @param string $curlopt
-     * @param mixed $curloptval
-     */
-    public function addOnCurlOption($curlopt, $curloptval)
-    {
-        $this->additional_curl_opts[$curlopt] = $curloptval;
-        return $this;
-    }
-
-    /**
-     * Turn payload from structured data into
-     * a string based on the current Mime type.
-     * This uses the auto_serialize option to determine
-     * it's course of action.  See serialize method for more.
-     * Renamed from _detectPayload to _serializePayload as of
-     * 2012-02-15.
-     *
-     * Added in support for custom payload serializers.
-     * The serialize_payload_method stuff still holds true though.
-     * @see Request::registerPayloadSerializer()
-     *
-     * @return string
-     * @param mixed $payload
-     */
-    private function _serializePayload($payload)
-    {
-        if (empty($payload) || $this->serialize_payload_method === self::SERIALIZE_PAYLOAD_NEVER)
-            return $payload;
-
-        // When we are in "smart" mode, don't serialize strings/scalars, assume they are already serialized
-        if ($this->serialize_payload_method === self::SERIALIZE_PAYLOAD_SMART && is_scalar($payload))
-            return $payload;
-
-        // Use a custom serializer if one is registered for this mime type
-        if (isset($this->payload_serializers['*']) || isset($this->payload_serializers[$this->content_type])) {
-            $key = isset($this->payload_serializers[$this->content_type]) ? $this->content_type : '*';
-            return call_user_func($this->payload_serializers[$key], $payload);
-        }
-
-        return Httpful::get($this->content_type)->serialize($payload);
-    }
-
-    /**
-     * HTTP Method Get
-     * @return Request
-     * @param string $uri optional uri to use
-     * @param string $mime expected
-     */
-    public static function get($uri, $mime = null)
-    {
-        return self::init(Http::GET)->uri($uri)->mime($mime);
-    }
-
-
-    /**
-     * Like Request:::get, except that it sends off the request as well
-     * returning a response
-     * @return Response
-     * @param string $uri optional uri to use
-     * @param string $mime expected
-     */
-    public static function getQuick($uri, $mime = null)
-    {
-        return self::get($uri, $mime)->send();
-    }
-
-    /**
-     * HTTP Method Post
-     * @return Request
-     * @param string $uri optional uri to use
-     * @param string $payload data to send in body of request
-     * @param string $mime MIME to use for Content-Type
-     */
-    public static function post($uri, $payload = null, $mime = null)
-    {
-        return self::init(Http::POST)->uri($uri)->body($payload, $mime);
-    }
-
-    /**
-     * HTTP Method Put
-     * @return Request
-     * @param string $uri optional uri to use
-     * @param string $payload data to send in body of request
-     * @param string $mime MIME to use for Content-Type
-     */
-    public static function put($uri, $payload = null, $mime = null)
-    {
-        return self::init(Http::PUT)->uri($uri)->body($payload, $mime);
-    }
-
-    /**
-     * HTTP Method Patch
-     * @return Request
-     * @param string $uri optional uri to use
-     * @param string $payload data to send in body of request
-     * @param string $mime MIME to use for Content-Type
-     */
-    public static function patch($uri, $payload = null, $mime = null)
-    {
-        return self::init(Http::PATCH)->uri($uri)->body($payload, $mime);
-    }
-
-    /**
-     * HTTP Method Delete
-     * @return Request
-     * @param string $uri optional uri to use
-     */
-    public static function delete($uri, $mime = null)
-    {
-        return self::init(Http::DELETE)->uri($uri)->mime($mime);
-    }
-
-    /**
-     * HTTP Method Head
-     * @return Request
-     * @param string $uri optional uri to use
-     */
-    public static function head($uri)
-    {
-        return self::init(Http::HEAD)->uri($uri);
-    }
-
-    /**
-     * HTTP Method Options
-     * @return Request
-     * @param string $uri optional uri to use
-     */
-    public static function options($uri)
-    {
-        return self::init(Http::OPTIONS)->uri($uri);
-    }
-}

externals/httpful/src/Httpful/Response.php

@@ -1,189 +0,0 @@
-<?php
-
-namespace Httpful;
-
-/**
- * Models an HTTP response
- *
- * @author Nate Good <me@nategood.com>
- */
-class Response
-{
-
-    public $body,
-           $raw_body,
-           $headers,
-           $raw_headers,
-           $request,
-           $code = 0,
-           $content_type,
-           $parent_type,
-           $charset,
-           $is_mime_vendor_specific = false,
-           $is_mime_personal = false;
-
-    private $parsers;
-    /**
-     * @param string $body
-     * @param string $headers
-     * @param Request $request
-     */
-    public function __construct($body, $headers, Request $request)
-    {
-        $this->request      = $request;
-        $this->raw_headers  = $headers;
-        $this->raw_body     = $body;
-
-        $this->code         = $this->_parseCode($headers);
-        $this->headers      = Response\Headers::fromString($headers);
-
-        $this->_interpretHeaders();
-
-        $this->body         = $this->_parse($body);
-    }
-
-    /**
-     * Status Code Definitions
-     *
-     * Informational 1xx
-     * Successful    2xx
-     * Redirection   3xx
-     * Client Error  4xx
-     * Server Error  5xx
-     *
-     * http://pretty-rfc.herokuapp.com/RFC2616#status.codes
-     *
-     * @return bool Did we receive a 4xx or 5xx?
-     */
-    public function hasErrors()
-    {
-        return $this->code >= 400;
-    }
-
-    /**
-     * @return return bool
-     */
-    public function hasBody()
-    {
-        return !empty($this->body);
-    }
-
-    /**
-     * Parse the response into a clean data structure
-     * (most often an associative array) based on the expected
-     * Mime type.
-     * @return array|string|object the response parse accordingly
-     * @param string Http response body
-     */
-    public function _parse($body)
-    {
-        // If the user decided to forgo the automatic
-        // smart parsing, short circuit.
-        if (!$this->request->auto_parse) {
-            return $body;
-        }
-
-        // If provided, use custom parsing callback
-        if (isset($this->request->parse_callback)) {
-            return call_user_func($this->request->parse_callback, $body);
-        }
-
-        // Decide how to parse the body of the response in the following order
-        //  1. If provided, use the mime type specifically set as part of the `Request`
-        //  2. If a MimeHandler is registered for the content type, use it
-        //  3. If provided, use the "parent type" of the mime type from the response
-        //  4. Default to the content-type provided in the response
-        $parse_with = $this->request->expected_type;
-        if (empty($this->request->expected_type)) {
-            $parse_with = Httpful::hasParserRegistered($this->content_type)
-                ? $this->content_type
-                : $this->parent_type;
-        }
-
-       return Httpful::get($parse_with)->parse($body);
-    }
-
-    /**
-     * Parse text headers from response into
-     * array of key value pairs
-     * @return array parse headers
-     * @param string $headers raw headers
-     */
-    public function _parseHeaders($headers)
-    {
-        $headers = preg_split("/(\r|\n)+/", $headers, -1, \PREG_SPLIT_NO_EMPTY);
-        $parse_headers = array();
-        for ($i = 1; $i < count($headers); $i++) {
-            list($key, $raw_value) = explode(':', $headers[$i], 2);
-            $key = trim($key);
-            $value = trim($raw_value);
-            if (array_key_exists($key, $parse_headers)) {
-                // See HTTP RFC Sec 4.2 Paragraph 5
-                // http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2
-                // If a header appears more than once, it must also be able to
-                // be represented as a single header with a comma-separated
-                // list of values.  We transform accordingly.
-                $parse_headers[$key] .= ',' . $value;
-            } else {
-                $parse_headers[$key] = $value;
-            }
-        }
-        return $parse_headers;
-    }
-
-    public function _parseCode($headers)
-    {
-        $parts = explode(' ', substr($headers, 0, strpos($headers, "\r\n")));
-        if (count($parts) < 2 || !is_numeric($parts[1])) {
-            throw new \Exception("Unable to parse response code from HTTP response due to malformed response");
-        }
-        return intval($parts[1]);
-    }
-
-    /**
-     * After we've parse the headers, let's clean things
-     * up a bit and treat some headers specially
-     */
-    public function _interpretHeaders()
-    {
-        // Parse the Content-Type and charset
-        $content_type = isset($this->headers['Content-Type']) ? $this->headers['Content-Type'] : '';
-        $content_type = explode(';', $content_type);
-
-        $this->content_type = $content_type[0];
-        if (count($content_type) == 2 && strpos($content_type[1], '=') !== false) {
-            list($nill, $this->charset) = explode('=', $content_type[1]);
-        }
-
-        // RFC 2616 states "text/*" Content-Types should have a default
-        // charset of ISO-8859-1. "application/*" and other Content-Types
-        // are assumed to have UTF-8 unless otherwise specified.
-        // http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7.1
-        // http://www.w3.org/International/O-HTTP-charset.en.php
-        if (!isset($this->charset)) {
-            $this->charset = substr($this->content_type, 5) === 'text/' ? 'iso-8859-1' : 'utf-8';
-        }
-
-        // Is vendor type? Is personal type?
-        if (strpos($this->content_type, '/') !== false) {
-            list($type, $sub_type) = explode('/', $this->content_type);
-            $this->is_mime_vendor_specific = substr($sub_type, 0, 4) === 'vnd.';
-            $this->is_mime_personal = substr($sub_type, 0, 4) === 'prs.';
-        }
-
-        // Parent type (e.g. xml for application/vnd.github.message+xml)
-        $this->parent_type = $this->content_type;
-        if (strpos($this->content_type, '+') !== false) {
-            list($vendor, $this->parent_type) = explode('+', $this->content_type, 2);
-            $this->parent_type = Mime::getFullMime($this->parent_type);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->raw_body;
-    }
-}

externals/httpful/src/Httpful/Response/Headers.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace Httpful\Response;
-
-final class Headers implements \ArrayAccess, \Countable {
-
-    private $headers;
-
-    private function __construct($headers)
-    {
-        $this->headers = $headers;
-    }
-
-    public static function fromString($string)
-    {
-        $lines = preg_split("/(\r|\n)+/", $string, -1, PREG_SPLIT_NO_EMPTY);
-        array_shift($lines); // HTTP HEADER
-        $headers = array();
-        foreach ($lines as $line) {
-            list($name, $value) = explode(':', $line, 2);
-            $headers[strtolower(trim($name))] = trim($value);
-        }
-        return new self($headers);
-    }
-
-    public function offsetExists($offset)
-    {
-        return isset($this->headers[strtolower($offset)]);
-    }
-
-    public function offsetGet($offset)
-    {
-        if (isset($this->headers[$name = strtolower($offset)])) {
-            return $this->headers[$name];
-        }
-    }
-
-    public function offsetSet($offset, $value)
-    {
-        throw new \Exception("Headers are read-only.");
-    }
-
-    public function offsetUnset($offset)
-    {
-        throw new \Exception("Headers are read-only.");
-    }
-
-    public function count()
-    {
-        return count($this->headers);
-    }
-
-    public function toArray()
-    {
-        return $this->headers;
-    }
-
-}

externals/httpful/tests/Httpful/HttpfulTest.php

@@ -1,458 +0,0 @@
-<?php
-/**
- * Port over the original tests into a more traditional PHPUnit
- * format.  Still need to hook into a lightweight HTTP server to
- * better test some things (e.g. obscure cURL settings).  I've moved
- * the old tests and node.js server to the tests/.legacy directory.
- *
- * @author Nate Good <me@nategood.com>
- */
-namespace Httpful\Test;
-
-require(dirname(dirname(dirname(__FILE__))) . '/bootstrap.php');
-\Httpful\Bootstrap::init();
-
-use Httpful\Httpful;
-use Httpful\Request;
-use Httpful\Mime;
-use Httpful\Http;
-use Httpful\Response;
-
-class HttpfulTest extends \PHPUnit_Framework_TestCase
-{
-    const TEST_SERVER = '127.0.0.1:8008';
-    const TEST_URL = 'http://127.0.0.1:8008';
-    const TEST_URL_400 = 'http://127.0.0.1:8008/400';
-
-    const SAMPLE_JSON_HEADER =
-"HTTP/1.1 200 OK
-Content-Type: application/json
-Connection: keep-alive
-Transfer-Encoding: chunked\r\n";
-    const SAMPLE_JSON_RESPONSE = '{"key":"value","object":{"key":"value"},"array":[1,2,3,4]}';
-    const SAMPLE_CSV_HEADER =
-"HTTP/1.1 200 OK
-Content-Type: text/csv
-Connection: keep-alive
-Transfer-Encoding: chunked\r\n";
-    const SAMPLE_CSV_RESPONSE =
-"Key1,Key2
-Value1,Value2
-\"40.0\",\"Forty\"";
-    const SAMPLE_XML_RESPONSE = '<stdClass><arrayProp><array><k1><myClass><intProp>2</intProp></myClass></k1></array></arrayProp><stringProp>a string</stringProp><boolProp>TRUE</boolProp></stdClass>';
-    const SAMPLE_XML_HEADER =
-"HTTP/1.1 200 OK
-Content-Type: application/xml
-Connection: keep-alive
-Transfer-Encoding: chunked\r\n";
-    const SAMPLE_VENDOR_HEADER =
-"HTTP/1.1 200 OK
-Content-Type: application/vnd.nategood.message+xml
-Connection: keep-alive
-Transfer-Encoding: chunked\r\n";
-    const SAMPLE_VENDOR_TYPE = "application/vnd.nategood.message+xml";
-    const SAMPLE_MULTI_HEADER =
-"HTTP/1.1 200 OK
-Content-Type: application/json
-Connection: keep-alive
-Transfer-Encoding: chunked
-X-My-Header:Value1
-X-My-Header:Value2\r\n";
-    function testInit()
-    {
-      $r = Request::init();
-      // Did we get a 'Request' object?
-      $this->assertEquals('Httpful\Request', get_class($r));
-    }
-
-    function testMethods()
-    {
-      $valid_methods = array('get', 'post', 'delete', 'put', 'options', 'head');
-      $url = 'http://example.com/';
-      foreach ($valid_methods as $method) {
-        $r = call_user_func(array('Httpful\Request', $method), $url);
-        $this->assertEquals('Httpful\Request', get_class($r));
-        $this->assertEquals(strtoupper($method), $r->method);
-      }
-    }
-
-    function testDefaults()
-    {
-        // Our current defaults are as follows
-        $r = Request::init();
-        $this->assertEquals(Http::GET, $r->method);
-        $this->assertFalse($r->strict_ssl);
-    }
-
-    function testShortMime()
-    {
-        // Valid short ones
-        $this->assertEquals(Mime::JSON,  Mime::getFullMime('json'));
-        $this->assertEquals(Mime::XML,   Mime::getFullMime('xml'));
-        $this->assertEquals(Mime::HTML,  Mime::getFullMime('html'));
-        $this->assertEquals(Mime::CSV,  Mime::getFullMime('csv'));
-
-        // Valid long ones
-        $this->assertEquals(Mime::JSON, Mime::getFullMime(Mime::JSON));
-        $this->assertEquals(Mime::XML,  Mime::getFullMime(Mime::XML));
-        $this->assertEquals(Mime::HTML, Mime::getFullMime(Mime::HTML));
-        $this->assertEquals(Mime::CSV, Mime::getFullMime(Mime::CSV));
-
-        // No false positives
-        $this->assertNotEquals(Mime::XML,  Mime::getFullMime(Mime::HTML));
-        $this->assertNotEquals(Mime::JSON, Mime::getFullMime(Mime::XML));
-        $this->assertNotEquals(Mime::HTML, Mime::getFullMime(Mime::JSON));
-        $this->assertNotEquals(Mime::XML, Mime::getFullMime(Mime::CSV));
-    }
-
-    function testSettingStrictSsl()
-    {
-        $r = Request::init()
-             ->withStrictSsl();
-
-        $this->assertTrue($r->strict_ssl);
-
-        $r = Request::init()
-             ->withoutStrictSsl();
-
-        $this->assertFalse($r->strict_ssl);
-    }
-
-    function testSendsAndExpectsType()
-    {
-        $r = Request::init()
-            ->sendsAndExpectsType(Mime::JSON);
-        $this->assertEquals(Mime::JSON, $r->expected_type);
-        $this->assertEquals(Mime::JSON, $r->content_type);
-
-        $r = Request::init()
-            ->sendsAndExpectsType('html');
-        $this->assertEquals(Mime::HTML, $r->expected_type);
-        $this->assertEquals(Mime::HTML, $r->content_type);
-
-        $r = Request::init()
-            ->sendsAndExpectsType('form');
-        $this->assertEquals(Mime::FORM, $r->expected_type);
-        $this->assertEquals(Mime::FORM, $r->content_type);
-
-        $r = Request::init()
-            ->sendsAndExpectsType('application/x-www-form-urlencoded');
-        $this->assertEquals(Mime::FORM, $r->expected_type);
-        $this->assertEquals(Mime::FORM, $r->content_type);
-
-        $r = Request::init()
-            ->sendsAndExpectsType(Mime::CSV);
-        $this->assertEquals(Mime::CSV, $r->expected_type);
-        $this->assertEquals(Mime::CSV, $r->content_type);
-    }
-
-    function testIni()
-    {
-        // Test setting defaults/templates
-
-        // Create the template
-        $template = Request::init()
-            ->method(Http::POST)
-            ->withStrictSsl()
-            ->expectsType(Mime::HTML)
-            ->sendsType(Mime::FORM);
-
-        Request::ini($template);
-
-        $r = Request::init();
-
-        $this->assertTrue($r->strict_ssl);
-        $this->assertEquals(Http::POST, $r->method);
-        $this->assertEquals(Mime::HTML, $r->expected_type);
-        $this->assertEquals(Mime::FORM, $r->content_type);
-
-        // Test the default accessor as well
-        $this->assertTrue(Request::d('strict_ssl'));
-        $this->assertEquals(Http::POST, Request::d('method'));
-        $this->assertEquals(Mime::HTML, Request::d('expected_type'));
-        $this->assertEquals(Mime::FORM, Request::d('content_type'));
-
-        Request::resetIni();
-    }
-
-    function testAccept()
-    {
-        $r = Request::get('http://example.com/')
-            ->expectsType(Mime::JSON);
-
-        $this->assertEquals(Mime::JSON, $r->expected_type);
-        $r->_curlPrep();
-        $this->assertContains('application/json', $r->raw_headers);
-    }
-
-    function testCustomAccept()
-    {
-        $accept = 'application/api-1.0+json';
-        $r = Request::get('http://example.com/')
-            ->addHeader('Accept', $accept);
-
-        $r->_curlPrep();
-        $this->assertContains($accept, $r->raw_headers);
-        $this->assertEquals($accept, $r->headers['Accept']);
-    }
-
-    function testUserAgent()
-    {
-        $r = Request::get('http://example.com/')
-            ->withUserAgent('ACME/1.2.3');
-
-        $this->assertArrayHasKey('User-Agent', $r->headers);
-        $r->_curlPrep();
-        $this->assertContains('User-Agent: ACME/1.2.3', $r->raw_headers);
-        $this->assertNotContains('User-Agent: HttpFul/1.0', $r->raw_headers);
-
-        $r = Request::get('http://example.com/')
-            ->withUserAgent('');
-
-        $this->assertArrayHasKey('User-Agent', $r->headers);
-        $r->_curlPrep();
-        $this->assertContains('User-Agent:', $r->raw_headers);
-        $this->assertNotContains('User-Agent: HttpFul/1.0', $r->raw_headers);
-    }
-
-    function testAuthSetup()
-    {
-        $username = 'nathan';
-        $password = 'opensesame';
-
-        $r = Request::get('http://example.com/')
-            ->authenticateWith($username, $password);
-
-        $this->assertEquals($username, $r->username);
-        $this->assertEquals($password, $r->password);
-        $this->assertTrue($r->hasBasicAuth());
-    }
-
-    function testDigestAuthSetup()
-    {
-        $username = 'nathan';
-        $password = 'opensesame';
-
-        $r = Request::get('http://example.com/')
-            ->authenticateWithDigest($username, $password);
-
-        $this->assertEquals($username, $r->username);
-        $this->assertEquals($password, $r->password);
-        $this->assertTrue($r->hasDigestAuth());
-    } 
-
-    function testJsonResponseParse()
-    {
-        $req = Request::init()->sendsAndExpects(Mime::JSON);
-        $response = new Response(self::SAMPLE_JSON_RESPONSE, self::SAMPLE_JSON_HEADER, $req);
-
-        $this->assertEquals("value", $response->body->key);
-        $this->assertEquals("value", $response->body->object->key);
-        $this->assertInternalType('array', $response->body->array);
-        $this->assertEquals(1, $response->body->array[0]);
-    }
-
-    function testXMLResponseParse()
-    {
-        $req = Request::init()->sendsAndExpects(Mime::XML);
-        $response = new Response(self::SAMPLE_XML_RESPONSE, self::SAMPLE_XML_HEADER, $req);
-        $sxe = $response->body;
-        $this->assertEquals("object", gettype($sxe));
-        $this->assertEquals("SimpleXMLElement", get_class($sxe));
-        $bools = $sxe->xpath('/stdClass/boolProp');
-        list( , $bool ) = each($bools);
-        $this->assertEquals("TRUE", (string) $bool);
-        $ints = $sxe->xpath('/stdClass/arrayProp/array/k1/myClass/intProp');
-        list( , $int ) = each($ints);
-        $this->assertEquals("2", (string) $int);
-        $strings = $sxe->xpath('/stdClass/stringProp');
-        list( , $string ) = each($strings);
-        $this->assertEquals("a string", (string) $string);
-    }
-
-    function testCsvResponseParse()
-    {
-        $req = Request::init()->sendsAndExpects(Mime::CSV);
-        $response = new Response(self::SAMPLE_CSV_RESPONSE, self::SAMPLE_CSV_HEADER, $req);
-
-        $this->assertEquals("Key1", $response->body[0][0]);
-        $this->assertEquals("Value1", $response->body[1][0]);
-        $this->assertInternalType('string', $response->body[2][0]);
-        $this->assertEquals("40.0", $response->body[2][0]);
-    }
-
-    function testParsingContentTypeCharset()
-    {
-        $req = Request::init()->sendsAndExpects(Mime::JSON);
-        // $response = new Response(SAMPLE_JSON_RESPONSE, "", $req);
-        // // Check default content type of iso-8859-1
-        $response = new Response(self::SAMPLE_JSON_RESPONSE, "HTTP/1.1 200 OK
-Content-Type: text/plain; charset=utf-8\r\n", $req);
-        $this->assertInstanceOf('Httpful\Response\Headers', $response->headers);
-        $this->assertEquals($response->headers['Content-Type'], 'text/plain; charset=utf-8');
-        $this->assertEquals($response->content_type, 'text/plain');
-        $this->assertEquals($response->charset, 'utf-8');
-    }
-
-    function testEmptyResponseParse()
-    {
-        $req = Request::init()->sendsAndExpects(Mime::JSON);
-        $response = new Response("", self::SAMPLE_JSON_HEADER, $req);
-        $this->assertEquals(null, $response->body);
-
-        $reqXml = Request::init()->sendsAndExpects(Mime::XML);
-        $responseXml = new Response("", self::SAMPLE_XML_HEADER, $reqXml);
-        $this->assertEquals(null, $responseXml->body);
-    }
-
-    function testNoAutoParse()
-    {
-        $req = Request::init()->sendsAndExpects(Mime::JSON)->withoutAutoParsing();
-        $response = new Response(self::SAMPLE_JSON_RESPONSE, self::SAMPLE_JSON_HEADER, $req);
-        $this->assertInternalType('string', $response->body);
-        $req = Request::init()->sendsAndExpects(Mime::JSON)->withAutoParsing();
-        $response = new Response(self::SAMPLE_JSON_RESPONSE, self::SAMPLE_JSON_HEADER, $req);
-        $this->assertInternalType('object', $response->body);
-    }
-
-    function testParseHeaders()
-    {
-        $req = Request::init()->sendsAndExpects(Mime::JSON);
-        $response = new Response(self::SAMPLE_JSON_RESPONSE, self::SAMPLE_JSON_HEADER, $req);
-        $this->assertEquals('application/json', $response->headers['Content-Type']);
-    }
-
-    function testRawHeaders()
-    {
-        $req = Request::init()->sendsAndExpects(Mime::JSON);
-        $response = new Response(self::SAMPLE_JSON_RESPONSE, self::SAMPLE_JSON_HEADER, $req);
-        $this->assertContains('Content-Type: application/json', $response->raw_headers);
-    }
-
-    function testHasErrors()
-    {
-        $req = Request::init()->sendsAndExpects(Mime::JSON);
-        $response = new Response('', "HTTP/1.1 100 Continue\r\n", $req);
-        $this->assertFalse($response->hasErrors());
-        $response = new Response('', "HTTP/1.1 200 OK\r\n", $req);
-        $this->assertFalse($response->hasErrors());
-        $response = new Response('', "HTTP/1.1 300 Multiple Choices\r\n", $req);
-        $this->assertFalse($response->hasErrors());
-        $response = new Response('', "HTTP/1.1 400 Bad Request\r\n", $req);
-        $this->assertTrue($response->hasErrors());
-        $response = new Response('', "HTTP/1.1 500 Internal Server Error\r\n", $req);
-        $this->assertTrue($response->hasErrors());
-    }
-
-    function test_parseCode()
-    {
-        $req = Request::init()->sendsAndExpects(Mime::JSON);
-        $response = new Response(self::SAMPLE_JSON_RESPONSE, self::SAMPLE_JSON_HEADER, $req);
-        $code = $response->_parseCode("HTTP/1.1 406 Not Acceptable\r\n");
-        $this->assertEquals(406, $code);
-    }
-
-    function testToString()
-    {
-        $req = Request::init()->sendsAndExpects(Mime::JSON);
-        $response = new Response(self::SAMPLE_JSON_RESPONSE, self::SAMPLE_JSON_HEADER, $req);
-        $this->assertEquals(self::SAMPLE_JSON_RESPONSE, (string)$response);
-    }
-
-    function test_parseHeaders()
-    {
-        $parse_headers = Response\Headers::fromString(self::SAMPLE_JSON_HEADER);
-        $this->assertCount(3, $parse_headers);
-        $this->assertEquals('application/json', $parse_headers['Content-Type']);
-        $this->assertTrue(isset($parse_headers['Connection']));
-    }
-
-    function testMultiHeaders()
-    {
-        $req = Request::init();
-        $response = new Response(self::SAMPLE_JSON_RESPONSE, self::SAMPLE_MULTI_HEADER, $req);
-        $parse_headers = $response->_parseHeaders(self::SAMPLE_MULTI_HEADER);
-        $this->assertEquals('Value1,Value2', $parse_headers['X-My-Header']);
-    }
-
-    function testDetectContentType()
-    {
-        $req = Request::init();
-        $response = new Response(self::SAMPLE_JSON_RESPONSE, self::SAMPLE_JSON_HEADER, $req);
-        $this->assertEquals('application/json', $response->headers['Content-Type']);
-    }
-
-    function testMissingBodyContentType()
-    {
-        $body = 'A string';
-        $request = Request::post(HttpfulTest::TEST_URL, $body)->_curlPrep();
-        $this->assertEquals($body, $request->serialized_payload);
-    }
-
-    function testParentType()
-    {
-        // Parent type
-        $request = Request::init()->sendsAndExpects(Mime::XML);
-        $response = new Response('<xml><name>Nathan</name></xml>', self::SAMPLE_VENDOR_HEADER, $request);
-
-        $this->assertEquals("application/xml", $response->parent_type);
-        $this->assertEquals(self::SAMPLE_VENDOR_TYPE, $response->content_type);
-        $this->assertTrue($response->is_mime_vendor_specific);
-
-        // Make sure we still parsed as if it were plain old XML
-        $this->assertEquals("Nathan", $response->body->name->__toString());
-    }
-
-    function testMissingContentType()
-    {
-        // Parent type
-        $request = Request::init()->sendsAndExpects(Mime::XML);
-        $response = new Response('<xml><name>Nathan</name></xml>',
-"HTTP/1.1 200 OK
-Connection: keep-alive
-Transfer-Encoding: chunked\r\n", $request);
-
-        $this->assertEquals("", $response->content_type);
-    }
-
-    function testCustomMimeRegistering()
-    {
-        // Register new mime type handler for "application/vnd.nategood.message+xml"
-        Httpful::register(self::SAMPLE_VENDOR_TYPE, new DemoMimeHandler());
-
-        $this->assertTrue(Httpful::hasParserRegistered(self::SAMPLE_VENDOR_TYPE));
-
-        $request = Request::init();
-        $response = new Response('<xml><name>Nathan</name></xml>', self::SAMPLE_VENDOR_HEADER, $request);
-
-        $this->assertEquals(self::SAMPLE_VENDOR_TYPE, $response->content_type);
-        $this->assertEquals('custom parse', $response->body);
-    }
-
-    public function testShorthandMimeDefinition()
-    {
-        $r = Request::init()->expects('json');
-        $this->assertEquals(Mime::JSON, $r->expected_type);
-
-        $r = Request::init()->expectsJson();
-        $this->assertEquals(Mime::JSON, $r->expected_type);
-    }
-
-    public function testOverrideXmlHandler()
-    {
-        // Lazy test...
-        $prev = \Httpful\Httpful::get(\Httpful\Mime::XML);
-        $this->assertEquals($prev, new \Httpful\Handlers\XmlHandler());
-        $conf = array('namespace' => 'http://example.com');
-        \Httpful\Httpful::register(\Httpful\Mime::XML, new \Httpful\Handlers\XmlHandler($conf));
-        $new = \Httpful\Httpful::get(\Httpful\Mime::XML);
-        $this->assertNotEquals($prev, $new);
-    }
-}
-
-class DemoMimeHandler extends \Httpful\Handlers\MimeHandlerAdapter {
-    public function parse($body) {
-        return 'custom parse';
-    }
-}
-

externals/httpful/tests/phpunit.xml

@@ -1,9 +0,0 @@
-<phpunit>
-    <testsuite name="Httpful">
-        <directory>.</directory>
-    </testsuite>
-    <logging>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>
-    </logging>
-</phpunit>
-

externals/restful/.gitignore

@@ -1,12 +0,0 @@
-# composer
-.buildpath
-composer.lock
-composer.phar
-vendor
-
-# phar
-*.phar
-
-# eclipse-pdt
-.settings
-.project

externals/restful/.travis.yml

@@ -1,8 +0,0 @@
-language: php
-before_script:
-  - curl -s http://getcomposer.org/installer | php
-  - php composer.phar install --prefer-source
-script: phpunit --bootstrap vendor/autoload.php tests/
-php:
-  - 5.3
-  - 5.4

externals/restful/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2012 Noone
-
-MIT License
-
-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.

externals/restful/README.md

@@ -1,111 +0,0 @@
-# RESTful
-
-Library for writing RESTful PHP clients.
-
-[![Build Status](https://secure.travis-ci.org/bninja/restful.png)](http://travis-ci.org/bninja/restful)
-
-The design of this library was heavily influenced by [Httpful](https://github.com/nategood/httpful). 
-
-## Requirements
-
-- [PHP](http://www.php.net) >= 5.3 **with** [cURL](http://www.php.net/manual/en/curl.installation.php)
-- [Httpful](https://github.com/nategood/httpful) >= 0.1
-    
-## Issues
-
-Please use appropriately tagged github [issues](https://github.com/bninja/restful/issues) to request features or report bugs.
-
-## Installation
-
-You can install using [composer](#composer), a [phar](#phar) package or from [source](#source). Note that RESTful is [PSR-0](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md) compliant:
-
-### Composer
-
-If you don't have Composer [install](http://getcomposer.org/doc/00-intro.md#installation) it:
-
-    $ curl -s https://getcomposer.org/installer | php
-
-Add this to your `composer.json`: 
-
-    {
-        "require": {
-            "bninja/restful": "*"
-        }
-    }
-    
-Refresh your dependencies:
-
-    $ php composer.phar update
-    
-
-Then make sure to `require` the autoloader and initialize both:
-    
-    <?php
-    require(__DIR__ . '/vendor/autoload.php');
-    
-    Httpful\Bootstrap::init();
-    RESTful\Bootstrap::init();
-    ...
-
-### Phar
-
-Download an Httpful [phar](http://php.net/manual/en/book.phar.php) file, which are all [here](https://github.com/nategood/httpful/downloads):    
-    
-    $ curl -s -L -o httpful.phar https://github.com/downloads/nategood/httpful/httpful.phar
-
-Download a RESTful [phar](http://php.net/manual/en/book.phar.php) file, which are all [here](https://github.com/bninja/restful/downloads):
-
-    $ curl -s -L -o restful.phar https://github.com/bninja/restful/downloads/restful-{VERSION}.phar
-    
-And then `include` both:
-
-    <?php
-    include(__DIR__ . '/httpful.phar');
-    include(__DIR__ . '/restful.phar');
-    ...
-
-### Source
-
-Download [Httpful](https://github.com/nategood/httpful) source:
-
-    $ curl -s -L -o httpful.zip https://github.com/nategood/httpful/zipball/master;
-    $ unzip httpful.zip; mv nategood-httpful* httpful; rm httpful.zip
-
-Download the RESTful source:
-
-    $ curl -s -L -o restful.zip https://github.com/bninja/restful/zipball/master
-    $ unzip restful.zip; mv bninja-restful-* restful; rm restful.zip
-
-And then `require` both bootstrap files:
-
-    <?php
-    require(__DIR__ . "/httpful/bootstrap.php")
-    require(__DIR__ . "/restful/bootstrap.php")
-    ...
-
-## Usage
-
-	TODO
-
-## Testing
-    
-    $ phpunit --bootstrap vendor/autoload.php tests/
-
-## Publishing
-
-1. Ensure that **all** [tests](#testing) pass
-2. Increment minor `VERSION` in `src/RESTful/Settings` and `composer.json` (`git commit -am 'v{VERSION} release'`)
-3. Tag it (`git tag -a v{VERSION} -m 'v{VERSION} release'`)
-4. Push the tag (`git push --tag`)
-5. [Packagist](http://packagist.org/packages/bninja/restful) will see the new tag and take it from there
-6. Build (`build-phar`) and upload a [phar](http://php.net/manual/en/book.phar.php) file 
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Write your code **and [tests](#testing)**
-4. Ensure all tests still pass (`phpunit --bootstrap vendor/autoload.php tests/`)
-5. Commit your changes (`git commit -am 'Add some feature'`)
-6. Push to the branch (`git push origin my-new-feature`)
-7. Create new pull request

externals/restful/bootstrap.php

@@ -1,4 +0,0 @@
-<?php
-
-require(__DIR__ . '/src/RESTful/Bootstrap.php');
-\RESTful\Bootstrap::init();

externals/restful/build-phar

@@ -1,36 +0,0 @@
-#!/usr/bin/php
-<?php
-include('src/RESTful/Settings.php');
-
-function exit_unless($condition, $msg = null) {
-    if ($condition)
-        return;
-    echo "[FAIL] $msg";
-    exit(1);
-}
-
-echo "Building Phar... ";
-$base_dir = dirname(__FILE__);
-$source_dir = $base_dir . '/src/RESTful/';
-$phar_name = 'restful.phar';
-$phar_path = $base_dir . '/' . $phar_name;
-$phar = new Phar($phar_path, 0, $phar_name);
-$stub = <<<HEREDOC
-<?php
-    // Phar Stub File
-    Phar::mapPhar('restful.phar');
-    include('phar://restful.phar/RESTful/Bootstrap.php');
-    \RESTful\Bootstrap::pharInit();
-
-    __HALT_COMPILER();
-HEREDOC;
-$phar->setStub($stub);
-exit_unless($phar, "Unable to create a phar. Make sure you have phar.readonly=0 set in your ini file.");
-$phar->buildFromDirectory(dirname($source_dir));
-echo "[ OK ]\n";
-
-echo "Renaming Phar... ";
-$phar_versioned_name = 'restful-' . \RESTful\Settings::VERSION . '.phar'; 
-$phar_versioned_path = $base_dir . '/' . $phar_versioned_name; 
-rename($phar_path, $phar_versioned_path);
-echo "[ OK ]\n";

externals/restful/composer.json

@@ -1,18 +0,0 @@
-{
-    "name": "bninja/restful",
-    "description": "Library for writing RESTful PHP clients.",
-    "homepage": "http://github.com/bninja/restful",
-    "license": "MIT",
-    "keywords": ["http", "api", "client", "rest"],
-    "version": "0.1.7",
-    "authors": [
-    ],
-    "require": {
-        "nategood/httpful": "*"
-    },
-    "autoload": {
-        "psr-0": {
-            "RESTful": "src/"
-        }
-    }
-}

externals/restful/src/RESTful/Bootstrap.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace RESTful;
-
-/**
- * Bootstrapper for RESTful does autoloading.
- */
-class Bootstrap
-{
-    const DIR_SEPARATOR = DIRECTORY_SEPARATOR;
-    const NAMESPACE_SEPARATOR = '\\';
-
-    public static $initialized = false;
-
-
-    public static function init()
-    {
-        spl_autoload_register(array('\RESTful\Bootstrap', 'autoload'));
-    }
-
-    public static function autoload($classname)
-    {
-        self::_autoload(dirname(dirname(__FILE__)), $classname);
-    }
-
-    public static function pharInit()
-    {
-        spl_autoload_register(array('\RESTful\Bootstrap', 'pharAutoload'));
-    }
-
-    public static function pharAutoload($classname)
-    {
-        self::_autoload('phar://restful.phar', $classname);
-    }
-
-    private static function _autoload($base, $classname)
-    {
-        $parts = explode(self::NAMESPACE_SEPARATOR, $classname);
-        $path = $base . self::DIR_SEPARATOR . implode(self::DIR_SEPARATOR, $parts) . '.php';
-        if (file_exists($path)) {
-            require_once($path);
-        }
-    }
-}

externals/restful/src/RESTful/Client.php

@@ -1,78 +0,0 @@
-<?php
-
-namespace RESTful;
-
-use RESTful\Exceptions\HTTPError;
-use RESTful\Settings;
-
-class Client
-{
-    public function __construct($settings_class, $request_class = null, $convert_error = null)
-    {
-        $this->request_class = $request_class == null ? '\Httpful\Request' : $request_class;
-        $this->settings_class = $settings_class;
-        $this->convert_error = $convert_error;
-    }
-
-    public function get($uri)
-    {
-        $settings_class = $this->settings_class;
-        $url = $settings_class::$url_root . $uri;
-        $request_class = $this->request_class;
-        $request = $request_class::get($url);
-
-        return $this->_op($request);
-    }
-
-    public function post($uri, $payload)
-    {
-        $settings_class = $this->settings_class;
-        $url = $settings_class::$url_root . $uri;
-        $request_class = $this->request_class;
-        $request = $request_class::post($url, $payload, 'json');
-
-        return $this->_op($request);
-    }
-
-    public function put($uri, $payload)
-    {
-        $settings_class = $this->settings_class;
-        $url = $settings_class::$url_root . $uri;
-        $request_class = $this->request_class;
-        $request = $request_class::put($url, $payload, 'json');
-
-        return $this->_op($request);
-    }
-
-    public function delete($uri)
-    {
-        $settings_class = $this->settings_class;
-        $url = $settings_class::$url_root . $uri;
-        $request_class = $this->request_class;
-        $request = $request_class::delete($url);
-
-        return $this->_op($request);
-    }
-
-    private function _op($request)
-    {
-        $settings_class = $this->settings_class;
-        $user_agent = $settings_class::$agent . '/' . $settings_class::$version;
-        $request->headers['User-Agent'] = $user_agent;
-        if ($settings_class::$api_key != null) {
-            $request = $request->authenticateWith($settings_class::$api_key, '');
-        }
-        $request->expects('json');
-        $response = $request->sendIt();
-        if ($response->hasErrors() || $response->code == 300) {
-            if ($this->convert_error != null) {
-                $error = call_user_func($this->convert_error, $response);
-            } else {
-                $error = new HTTPError($response);
-            }
-            throw $error;
-        }
-
-        return $response;
-    }
-}

externals/restful/src/RESTful/Collection.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace RESTful;
-
-class Collection extends Itemization
-{
-    public function __construct($resource, $uri, $data = null)
-    {
-        parent::__construct($resource, $uri, $data);
-        $this->_parseUri();
-    }
-
-    private function _parseUri()
-    {
-        $parsed = parse_url($this->uri);
-        $this->_uri = $parsed['path'];
-        if (array_key_exists('query', $parsed)) {
-            foreach (explode('&', $parsed['query']) as $param) {
-                $param = explode('=', $param);
-                $key = urldecode($param[0]);
-                $val = (count($param) == 1) ? null : urldecode($param[1]);
-
-                // size
-                if ($key == 'limit') {
-                    $this->_size = $val;
-                }
-            }
-        }
-    }
-
-    public function create($payload)
-    {
-        $class = $this->resource;
-        $client = $class::getClient();
-        $response = $client->post($this->uri, $payload);
-
-        return new $this->resource($response->body);
-    }
-
-    public function query()
-    {
-        return new Query($this->resource, $this->uri);
-    }
-
-    public function paginate()
-    {
-        return new Pagination($this->resource, $this->uri);
-    }
-}

externals/restful/src/RESTful/Exceptions/Base.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace RESTful\Exceptions;
-
-/**
- * Base class for all RESTful\Exceptions.
- */
-class Base extends \Exception
-{
-}

externals/restful/src/RESTful/Exceptions/HTTPError.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace RESTful\Exceptions;
-
-/**
- * Indicates an HTTP level error has occurred. The underlying HTTP response is
- * stored as response member. The response payload fields if any are stored as
- * members of the same name.
- *
- * @see \Httpful\Response
- */
-class HTTPError extends Base
-{
-    public $response;
-
-    public function __construct($response)
-    {
-        $this->response = $response;
-        $this->_objectify($this->response->body);
-    }
-
-    protected function _objectify($fields)
-    {
-        foreach ($fields as $key => $val) {
-            $this->$key = $val;
-        }
-    }
-}

externals/restful/src/RESTful/Exceptions/MultipleResultsFound.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace RESTful\Exceptions;
-
-/**
- * Indicates that a query unexpectedly returned multiple results when at most
- * one was expected.
- */
-class MultipleResultsFound extends Base
-{
-}

externals/restful/src/RESTful/Exceptions/NoResultFound.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace RESTful\Exceptions;
-
-/**
- * Indicates that a query unexpectedly returned no results.
- */
-class NoResultFound extends Base
-{
-}

externals/restful/src/RESTful/Field.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace RESTful;
-
-class Field
-{
-    public $name;
-
-    public function __construct($name)
-    {
-        $this->name = $name;
-    }
-
-    public function __get($name)
-    {
-        return new Field($this->name . '.' . $name);
-    }
-
-    public function in($vals)
-    {
-        return new FilterExpression($this->name, 'in', $vals, '!in');
-    }
-
-    public function startswith($prefix)
-    {
-        if (!is_string($prefix)) {
-            throw new \InvalidArgumentException('"startswith" prefix  must be a string');
-        }
-
-        return new FilterExpression($this->name, 'contains', $prefix);
-    }
-
-    public function endswith($suffix)
-    {
-        if (!is_string($suffix)) {
-            throw new \InvalidArgumentException('"endswith" suffix  must be a string');
-        }
-
-        return new FilterExpression($this->name, 'contains', $suffix);
-    }
-
-    public function contains($fragment)
-    {
-        if (!is_string($fragment)) {
-            throw new \InvalidArgumentException('"contains" fragment must be a string');
-        }
-
-        return new FilterExpression($this->name, 'contains', $fragment, '!contains');
-    }
-
-    public function eq($val)
-    {
-        return new FilterExpression($this->name, '=', $val, '!eq');
-    }
-
-    public function lt($val)
-    {
-        return new FilterExpression($this->name, '<', $val, '>=');
-    }
-
-    public function lte($val)
-    {
-        return new FilterExpression($this->name, '<=', $val, '>');
-    }
-
-    public function gt($val)
-    {
-        return new FilterExpression($this->name, '>', $val, '<=');
-    }
-
-    public function gte($val)
-    {
-        return new FilterExpression($this->name, '>=', $val, '<');
-    }
-
-    public function asc()
-    {
-        return new SortExpression($this->name, true);
-    }
-
-    public function desc()
-    {
-        return new SortExpression($this->name, false);
-    }
-}

externals/restful/src/RESTful/Fields.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace RESTful;
-
-class Fields
-{
-    public function __get($name)
-    {
-        return new Field($name);
-    }
-}

externals/restful/src/RESTful/FilterExpression.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace RESTful;
-
-class FilterExpression
-{
-    public $field,
-        $op,
-        $val,
-        $not_op;
-
-    public function __construct($field, $op, $val, $not_op = null)
-    {
-        $this->field = $field;
-        $this->op = $op;
-        $this->val = $val;
-        $this->not_op = $not_op;
-    }
-
-    public function not()
-    {
-        if (null === $this->not_op) {
-            throw new \LogicException(sprintf('Filter cannot be inverted'));
-        }
-        $temp = $this->op;
-        $this->op = $this->not_op;
-        $this->not_op = $temp;
-
-        return $this;
-    }
-}

externals/restful/src/RESTful/Itemization.php

@@ -1,99 +0,0 @@
-<?php
-
-namespace RESTful;
-
-class Itemization implements \IteratorAggregate, \ArrayAccess
-{
-    public $resource,
-        $uri;
-
-    protected $_page,
-        $_offset = 0,
-        $_size = 25;
-
-    public function __construct($resource, $uri, $data = null)
-    {
-        $this->resource = $resource;
-        $this->uri = $uri;
-        if ($data != null) {
-            $this->_page = new Page($resource, $uri, $data);
-        } else {
-            $this->_page = null;
-        }
-    }
-
-    protected function _getPage($offset = null)
-    {
-        if ($this->_page == null) {
-            $this->_offset = ($offset == null) ? 0 : $offset * $this->_size;
-            $uri = $this->_buildUri();
-            $this->_page = new Page($this->resource, $uri);
-        } elseif ($offset != null) {
-            $offset = $offset * $this->_size;
-            if ($offset != $this->_offset) {
-                $this->_offset = $offset;
-                $uri = $this->_buildUri();
-                $this->_page = new Page($this->resource, $uri);
-            }
-        }
-
-        return $this->_page;
-    }
-
-    protected function _getItem($offset)
-    {
-        $page_offset = floor($offset / $this->_size);
-        $page = $this->_getPage($page_offset);
-
-        return $page->items[$offset - $page->offset];
-    }
-
-    public function total()
-    {
-        return $this->_getPage()->total;
-    }
-
-    protected function _buildUri($offset = null)
-    {
-        # TODO: hacky but works for now
-        $offset = ($offset == null) ? $this->_offset : $offset;
-        if (strpos($this->uri, '?') === false) {
-            $uri = $this->uri . '?';
-        } else {
-            $uri = $this->uri . '&';
-        }
-        $uri = $uri . 'offset=' . strval($offset);
-
-        return $uri;
-    }
-
-    // IteratorAggregate
-    public function getIterator()
-    {
-        $uri = $this->_buildUri($offset = 0);
-        $uri = $this->_buildUri($offset = 0);
-
-        return new ItemizationIterator($this->resource, $uri);
-    }
-
-    // ArrayAccess
-    public function offsetSet($offset, $value)
-    {
-        throw new \BadMethodCallException(get_class($this) . ' array access is read-only');
-    }
-
-    public function offsetExists($offset)
-    {
-        return (0 <= $offset && $offset < $this->total());
-    }
-
-    public function offsetUnset($offset)
-    {
-        throw new \BadMethodCallException(get_class($this) . ' array access is read-only');
-    }
-
-    public function offsetGet($offset)
-    {
-        return $this->_getItem($offset);
-    }
-}

externals/restful/src/RESTful/ItemizationIterator.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace RESTful;
-
-class ItemizationIterator implements \Iterator
-{
-    protected $_page,
-        $_offset = 0;
-
-    public function __construct($resource, $uri, $data = null)
-    {
-        $this->_page = new Page($resource, $uri, $data);
-    }
-
-    // Iterator
-    public function current()
-    {
-        return $this->_page->items[$this->_offset];
-    }
-
-    public function key()
-    {
-        return $this->_page->offset + $this->_offset;
-    }
-
-    public function next()
-    {
-        $this->_offset += 1;
-        if ($this->_offset >= count($this->_page->items)) {
-            $this->_offset = 0;
-            $this->_page = $this->_page->next();
-        }
-    }
-
-    public function rewind()
-    {
-        $this->_page = $this->_page->first();
-        $this->_offset = 0;
-    }
-
-    public function valid()
-    {
-        return ($this->_page != null && $this->_offset < count($this->_page->items));
-    }
-}

externals/restful/src/RESTful/Page.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace RESTful;
-
-class Page
-{
-    public $resource,
-        $total,
-        $items,
-        $offset,
-        $limit;
-
-    private $_first_uri,
-        $_previous_uri,
-        $_next_uri,
-        $_last_uri;
-
-    public function __construct($resource, $uri, $data = null)
-    {
-        $this->resource = $resource;
-        if ($data == null) {
-            $client = $resource::getClient();
-            $data = $client->get($uri)->body;
-        }
-        $this->total = $data->total;
-        $this->items = array_map(
-            function ($x) use ($resource) {
-                return new $resource($x);
-            },
-            $data->items);
-        $this->offset = $data->offset;
-        $this->limit = $data->limit;
-        $this->_first_uri = property_exists($data, 'first_uri') ? $data->first_uri : null;
-        $this->_previous_uri = property_exists($data, 'previous_uri') ? $data->previous_uri : null;
-        $this->_next_uri = property_exists($data, 'next_uri') ? $data->next_uri : null;
-        $this->_last_uri = property_exists($data, 'last_uri') ? $data->last_uri : null;
-    }
-
-    public function first()
-    {
-        return new Page($this->resource, $this->_first_uri);
-    }
-
-    public function next()
-    {
-        if (!$this->hasNext()) {
-            return null;
-        }
-
-        return new Page($this->resource, $this->_next_uri);
-    }
-
-    public function hasNext()
-    {
-        return $this->_next_uri != null;
-    }
-
-    public function previous()
-    {
-        return new Page($this->resource, $this->_previous_uri);
-    }
-
-    public function hasPrevious()
-    {
-        return $this->_previous_uri != null;
-    }
-
-    public function last()
-    {
-        return new Page($this->resource, $this->_last_uri);
-    }
-}

externals/restful/src/RESTful/Pagination.php

@@ -1,90 +0,0 @@
-<?php
-
-namespace RESTful;
-
-class Pagination implements \IteratorAggregate, \ArrayAccess
-{
-    public $resource,
-        $uri;
-
-    protected $_page,
-        $_offset = 0,
-        $_size = 25;
-
-    public function __construct($resource, $uri, $data = null)
-    {
-        $this->resource = $resource;
-        $this->uri = $uri;
-        if ($data != null) {
-            $this->_page = new Page($resource, $uri, $data);
-        } else {
-            $this->_page = null;
-        }
-    }
-
-    protected function _getPage($offset = null)
-    {
-        if ($this->_page == null) {
-            $this->_offset = ($offset == null) ? 0 : $offset * $this->_size;
-            $uri = $this->_buildUri();
-            $this->_page = new Page($this->resource, $uri);
-        } elseif ($offset != null) {
-            $offset = $offset * $this->_size;
-            if ($offset != $this->_offset) {
-                $this->_offset = $offset;
-                $uri = $this->_buildUri();
-                $this->_page = new Page($this->resource, $uri);
-            }
-        }
-
-        return $this->_page;
-    }
-
-    public function total()
-    {
-        return floor($this->_getPage()->total / $this->_size);
-    }
-
-    protected function _buildUri($offset = null)
-    {
-        # TODO: hacky but works for now
-        $offset = ($offset == null) ? $this->_offset : $offset;
-        if (strpos($this->uri, '?') === false) {
-            $uri = $this->uri . '?';
-        } else {
-            $uri = $this->uri . '&';
-        }
-        $uri = $uri . 'offset=' . strval($offset);
-
-        return $uri;
-    }
-
-    // IteratorAggregate
-    public function getIterator()
-    {
-        $uri = $this->_buildUri($offset = 0);
-
-        return new PaginationIterator($this->resource, $uri);
-    }
-
-    // ArrayAccess
-    public function offsetSet($offset, $value)
-    {
-        throw new \BadMethodCallException(get_class($this) . ' array access is read-only');
-    }
-
-    public function offsetExists($offset)
-    {
-        return (0 <= $offset && $offset < $this->total());
-    }
-
-    public function offsetUnset($offset)
-    {
-        throw new \BadMethodCallException(get_class($this) . ' array access is read-only');
-    }
-
-    public function offsetGet($offset)
-    {
-        return $this->_getPage($offset);
-    }
-}

externals/restful/src/RESTful/PaginationIterator.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace RESTful;
-
-class PaginationIterator implements \Iterator
-{
-    public function __construct($resource, $uri, $data = null)
-    {
-        $this->_page = new Page($resource, $uri, $data);
-    }
-
-    // Iterator
-    public function current()
-    {
-        return $this->_page;
-    }
-
-    public function key()
-    {
-        return $this->_page->index;
-    }
-
-    public function next()
-    {
-        $this->_page = $this->_page->next();
-    }
-
-    public function rewind()
-    {
-        $this->_page = $this->_page->first();
-    }
-
-    public function valid()
-    {
-        return $this->_page != null;
-    }
-}

externals/restful/src/RESTful/Query.php

@@ -1,161 +0,0 @@
-<?php
-
-namespace RESTful;
-
-use RESTful\Exceptions\NoResultFound;
-use RESTful\Exceptions\MultipleResultsFound;
-
-class Query extends Itemization
-{
-    public $filters = array(),
-        $sorts = array(),
-        $size;
-
-    public function __construct($resource, $uri)
-    {
-        parent::__construct($resource, $uri);
-        $this->size = $this->_size;
-        $this->_parseUri($uri);
-    }
-
-    private function _parseUri($uri)
-    {
-        $parsed = parse_url($uri);
-        $this->uri = $parsed['path'];
-        if (array_key_exists('query', $parsed)) {
-            foreach (explode('&', $parsed['query']) as $param) {
-                $param = explode('=', $param);
-                $key = urldecode($param[0]);
-                $val = (count($param) == 1) ? null : urldecode($param[1]);
-
-                // limit
-                if ($key == 'limit') {
-                    $this->size = $this->_size = $val;
-                } // sorts
-                else if ($key == 'sort') {
-                    array_push($this->sorts, $val);
-                } // everything else
-                else {
-                    if (!array_key_exists($key, $this->filters)) {
-                        $this->filters[$key] = array();
-                    }
-                    if (!is_array($val)) {
-                        $val = array($val);
-                    }
-                    $this->filters[$key] = array_merge($this->filters[$key], $val);
-                }
-            }
-        }
-    }
-
-    protected function _buildUri($offset = null)
-    {
-        // params
-        $params = array_merge(
-            $this->filters,
-            array(
-                'sort'   => $this->sorts,
-                'limit'  => $this->_size,
-                'offset' => ($offset == null) ? $this->_offset : $offset
-            )
-        );
-        $getSingle = function ($v) {
-            if (is_array($v) && count($v) == 1)
-                return $v[0];
-            return $v;
-        };
-        $params = array_map($getSingle, $params);
-
-        // url encode params
-        // NOTE: http://stackoverflow.com/a/8171667/1339571
-        $qs = http_build_query($params);
-        $qs = preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $qs);
-
-        return $this->uri . '?' . $qs;
-    }
-
-    private function _reset()
-    {
-        $this->_page = null;
-    }
-
-    public function filter($expression)
-    {
-        if ($expression->op == '=') {
-            $field = $expression->field;
-        } else {
-            $field = $expression->field . '[' . $expression->op . ']';
-        }
-        if (is_array($expression->val)) {
-            $val = implode(',', $expression->val);
-        } else {
-            $val = $expression->val;
-        }
-        if (!array_key_exists($field, $this->filters)) {
-            $this->filters[$field] = array();
-        }
-        array_push($this->filters[$field], $val);
-        $this->_reset();
-
-        return $this;
-    }
-
-    public function sort($expression)
-    {
-        $dir = $expression->ascending ? 'asc' : 'desc';
-        array_push($this->sorts, $expression->field . ',' . $dir);
-        $this->_reset();
-
-        return $this;
-    }
-
-    public function limit($limit)
-    {
-        $this->size = $this->_size = $limit;
-        $this->_reset();
-
-        return $this;
-    }
-
-    public function all()
-    {
-        $items = array();
-        foreach ($this as $item) {
-            array_push($items, $item);
-        }
-
-        return $items;
-    }
-
-    public function first()
-    {
-        $prev_size = $this->_size;
-        $this->_size = 1;
-        $page = new Page($this->resource, $this->_buildUri());
-        $this->_size = $prev_size;
-        $item = count($page->items) != 0 ? $page->items[0] : null;
-
-        return $item;
-    }
-
-    public function one()
-    {
-        $prev_size = $this->_size;
-        $this->_size = 2;
-        $page = new Page($this->resource, $this->_buildUri());
-        $this->_size = $prev_size;
-        if (count($page->items) == 1) {
-            return $page->items[0];
-        }
-        if (count($page->items) == 0) {
-            throw new NoResultFound();
-        }
-
-        throw new MultipleResultsFound();
-    }
-
-    public function paginate()
-    {
-        return new Pagination($this->resource, $this->_buildUri());
-    }
-}

externals/restful/src/RESTful/Registry.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace RESTful;
-
-class Registry
-{
-    protected $_resources = array();
-
-    public function add($resource)
-    {
-        array_push($this->_resources, $resource);
-    }
-
-    public function match($uri)
-    {
-        foreach ($this->_resources as $resource) {
-            $spec = $resource::getURISpec();
-            $result = $spec->match($uri);
-            if ($result == null) {
-                continue;
-            }
-            $result['class'] = $resource;
-
-            return $result;
-        }
-
-        return null;
-    }
-}

externals/restful/src/RESTful/Resource.php

@@ -1,205 +0,0 @@
-<?php
-
-namespace RESTful;
-
-abstract class Resource
-{
-    protected $_collection_uris,
-        $_member_uris;
-
-    public static function getClient()
-    {
-        $class = get_called_class();
-
-        return $class::$_client;
-    }
-
-    public static function getRegistry()
-    {
-        $class = get_called_class();
-
-        return $class::$_registry;
-    }
-
-    public static function getURISpec()
-    {
-        $class = get_called_class();
-
-        return $class::$_uri_spec;
-    }
-
-    public function __construct($fields = null)
-    {
-        if ($fields == null) {
-            $fields = array();
-        }
-        $this->_objectify($fields);
-    }
-
-    public function __get($name)
-    {
-        // collection uri
-        if (array_key_exists($name, $this->_collection_uris)) {
-            $result = $this->_collection_uris[$name];
-            $this->$name = new Collection($result['class'], $result['uri']);
-
-            return $this->$name;
-        } // member uri
-        else if (array_key_exists($name, $this->_member_uris)) {
-            $result = $this->$_collection_uris[$name];
-            $response = self::getClient() . get($result['uri']);
-            $class = $result['class'];
-            $this->$name = new $class($response->body);
-
-            return $this->$name;
-        }
-
-        // unknown
-        $trace = debug_backtrace();
-        trigger_error(
-            sprintf('Undefined property via __get(): %s in %s on line %s', $name, $trace[0]['file'], $trace[0]['line']),
-            E_USER_NOTICE
-        );
-
-        return null;
-    }
-
-    public function __isset($name)
-    {
-        if (array_key_exists($name, $this->_collection_uris) || array_key_exists($name, $this->_member_uris)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    protected function _objectify($fields)
-    {
-        // initialize uris
-        $this->_collection_uris = array();
-        $this->_member_uris = array();
-
-        foreach ($fields as $key => $val) {
-            // nested uri
-            if ((strlen($key) - 3) == strrpos($key, 'uri', 0) && $key != 'uri') {
-                $result = self::getRegistry()->match($val);
-                if ($result != null) {
-                    $name = substr($key, 0, -4);
-                    $class = $result['class'];
-                    if ($result['collection']) {
-                        $this->_collection_uris[$name] = array(
-                            'class' => $class,
-                            'uri'   => $val,
-                        );
-                    } else {
-                        $this->_member_uris[$name] = array(
-                            'class' => $class,
-                            'uri'   => $val,
-                        );
-                    }
-
-                    continue;
-                }
-            } elseif (is_object($val) && property_exists($val, 'uri')) {
-                // nested
-                $result = self::getRegistry()->match($val->uri);
-                if ($result != null) {
-                    $class = $result['class'];
-                    if ($result['collection']) {
-                        $this->$key = new Collection($class, $val['uri'], $val);
-                    } else {
-                        $this->$key = new $class($val);
-                    }
-
-                    continue;
-                }
-            } elseif (is_array($val) && array_key_exists('uri', $val)) {
-                $result = self::getRegistry()->match($val['uri']);
-                if ($result != null) {
-                    $class = $result['class'];
-                    if ($result['collection']) {
-                        $this->$key = new Collection($class, $val['uri'], $val);
-                    } else {
-                        $this->$key = new $class($val);
-                    }
-
-                    continue;
-                }
-            }
-
-            // default
-            $this->$key = $val;
-        }
-    }
-
-    public static function query()
-    {
-        $uri_spec = self::getURISpec();
-        if ($uri_spec == null || $uri_spec->collection_uri == null) {
-            $msg = sprintf('Cannot directly query %s resources', get_called_class());
-            throw new \LogicException($msg);
-        }
-
-        return new Query(get_called_class(), $uri_spec->collection_uri);
-    }
-
-    public static function get($uri)
-    {
-        # id
-        if (strncmp($uri, '/', 1)) {
-            $uri_spec = self::getURISpec();
-            if ($uri_spec == null || $uri_spec->collection_uri == null) {
-                $msg = sprintf('Cannot get %s resources by id %s', $class, $uri);
-                throw new \LogicException($msg);
-            }
-            $uri = $uri_spec->collection_uri . '/' . $uri;
-        }
-
-        $response = self::getClient()->get($uri);
-        $class = get_called_class();
-
-        return new $class($response->body);
-    }
-
-    public function save()
-    {
-        // payload
-        $payload = array();
-        foreach ($this as $key => $val) {
-            if ($key[0] == '_' || is_object($val)) {
-                continue;
-            }
-            $payload[$key] = $val;
-        }
-
-        // update
-        if (array_key_exists('uri', $payload)) {
-            $uri = $payload['uri'];
-            unset($payload['uri']);
-            $response = self::getClient()->put($uri, $payload);
-        } else {
-            // create
-            $class = get_class($this);
-            if ($class::$_uri_spec == null || $class::$_uri_spec->collection_uri == null) {
-                $msg = sprintf('Cannot directly create %s resources', $class);
-                throw new \LogicException($msg);
-            }
-            $response = self::getClient()->post($class::$_uri_spec->collection_uri, $payload);
-        }
-
-        // re-objectify
-        foreach ($this as $key => $val) {
-            unset($this->$key);
-        }
-        $this->_objectify($response->body);
-
-        return $this;
-    }
-
-    public function delete()
-    {
-        self::getClient()->delete($this->uri);
-
-        return $this;
-    }
-}

externals/restful/src/RESTful/Settings.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace RESTful;
-
-/**
- * Settings.
- *
- */
-class Settings
-{
-    const VERSION = '0.1.7';
-}

externals/restful/src/RESTful/SortExpression.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace RESTful;
-
-class SortExpression
-{
-    public $name,
-        $ascending;
-
-    public function __construct($field, $ascending = true)
-    {
-        $this->field = $field;
-        $this->ascending = $ascending;
-    }
-}

externals/restful/src/RESTful/URISpec.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace RESTful;
-
-class URISpec
-{
-    public $collection_uri = null,
-        $name,
-        $idNames;
-
-    public function __construct($name, $idNames, $root = null)
-    {
-        $this->name = $name;
-        if (!is_array($idNames)) {
-            $idNames = array($idNames);
-        }
-        $this->idNames = $idNames;
-        if ($root != null) {
-            if ($root == '' || substr($root, -1) == '/') {
-                $this->collection_uri = $root . $name;
-            } else {
-                $this->collection_uri = $root . '/' . $name;
-            }
-        }
-    }
-
-    public function match($uri)
-    {
-        $parts = explode('/', rtrim($uri, "/"));
-
-        // collection
-        if ($parts[count($parts) - 1] == $this->name) {
-
-            return array(
-                'collection' => true,
-            );
-        }
-
-        // non-member
-        if (count($parts) < count($this->idNames) + 1 ||
-            $parts[count($parts) - 1 - count($this->idNames)] != $this->name
-        ) {
-            return null;
-        }
-
-        // member
-        $ids = array_combine(
-            $this->idNames,
-            array_slice($parts, -count($this->idNames))
-        );
-        $result = array(
-            'collection' => false,
-            'ids'        => $ids,
-        );
-
-        return $result;
-    }
-}

externals/restful/tests/RESTful/CoreTest.php

@@ -1,241 +0,0 @@
-<?php
-
-namespace RESTful\Test;
-
-\RESTful\Bootstrap::init();
-\Httpful\Bootstrap::init();
-
-use RESTful\URISpec;
-use RESTful\Client;
-use RESTful\Registry;
-use RESTful\Fields;
-use RESTful\Query;
-use RESTful\Page;
-
-class Settings
-{
-    public static $url_root = 'http://api.example.com';
-
-    public static $agent = 'example-php';
-
-    public static $version = '0.1.0';
-
-    public static $api_key = null;
-}
-
-class Resource extends \RESTful\Resource
-{
-    public static $fields, $f;
-
-    protected static $_client, $_registry, $_uri_spec;
-
-    public static function init()
-    {
-        self::$_client = new Client('Settings');
-        self::$_registry = new Registry();
-        self::$f = self::$fields = new Fields();
-    }
-
-    public static function getClient()
-    {
-        $class = get_called_class();
-        return $class::$_client;
-    }
-
-    public static function getRegistry()
-    {
-        $class = get_called_class();
-        return $class::$_registry;
-    }
-
-    public static function getURISpec()
-    {
-        $class = get_called_class();
-        return $class::$_uri_spec;
-    }
-}
-
-Resource::init();
-
-class A extends Resource
-{
-    protected static $_uri_spec = null;
-
-    public static function init()
-    {
-        self::$_uri_spec = new URISpec('as', 'id', '/');
-        self::$_registry->add(get_called_class());
-    }
-}
-
-A::init();
-
-class B extends Resource
-{
-    protected static $_uri_spec = null;
-
-    public static function init()
-    {
-        self::$_uri_spec = new URISpec('bs', 'id', '/');
-        self::$_registry->add(get_called_class());
-    }
-}
-
-B::init();
-
-class URISpecTest extends \PHPUnit_Framework_TestCase
-{
-    public function testNoRoot()
-    {
-        $uri_spec = new URISpec('grapes', 'seed');
-        $this->assertEquals($uri_spec->collection_uri, null);
-
-        $result = $uri_spec->match('/some/raisins');
-        $this->assertEquals($result, null);
-
-        $result = $uri_spec->match('/some/grapes');
-        $this->assertEquals($result, array('collection' => true));
-
-        $result = $uri_spec->match('/some/grapes/1234');
-        $expected = array(
-            'collection' => false,
-            'ids' => array('seed' => '1234')
-            );
-        $this->assertEquals($expected, $result);
-    }
-
-    public function testSingleId()
-    {
-        $uri_spec = new URISpec('tomatoes', 'stem', '/v1');
-        $this->assertNotEquals($uri_spec->collection_uri, null);
-
-        $result = $uri_spec->match('/some/tomatoes/that/are/green');
-        $this->assertEquals($result, null);
-
-        $result = $uri_spec->match('/some/tomatoes');
-        $this->assertEquals($result, array('collection' => true));
-
-        $result = $uri_spec->match('/some/tomatoes/4321');
-        $expected = array(
-            'collection' => false,
-            'ids' => array('stem' => '4321')
-            );
-        $this->assertEquals($expected, $result);
-    }
-
-    public function testMultipleIds()
-    {
-        $uri_spec = new URISpec('tomatoes', array('stem', 'root'), '/v1');
-        $this->assertNotEquals($uri_spec->collection_uri, null);
-
-        $result = $uri_spec->match('/some/tomatoes/that/are/green');
-        $this->assertEquals($result, null);
-
-        $result = $uri_spec->match('/some/tomatoes');
-        $this->assertEquals($result, array('collection' => true));
-
-        $result = $uri_spec->match('/some/tomatoes/4321/1234');
-        $expected = array(
-            'collection' => false,
-            'ids' => array('stem' => '4321', 'root' => '1234')
-            );
-        $this->assertEquals($expected, $result);
-    }
-}
-
-class QueryTest extends \PHPUnit_Framework_TestCase
-{
-    public function testParse()
-    {
-        $uri = '/some/uri?field2=123&sort=field5%2Cdesc&limit=101&field3.field4%5Bcontains%5D=hi';
-        $query = new Query('Resource', $uri);
-        $expected = array(
-            'field2' => array('123'),
-            'field3.field4[contains]' => array('hi')
-            );
-        $this->assertEquals($query->filters, $expected);
-        $expected = array('field5,desc');
-        $this->assertEquals($query->sorts, $expected);
-        $this->assertEquals($query->size, 101);
-    }
-
-    public function testBuild()
-    {
-        $query = new Query('Resource', '/some/uri');
-        $query->filter(Resource::$f->name->eq('Wonka Chocs'))
-              ->filter(Resource::$f->support_email->endswith('gmail.com'))
-              ->filter(Resource::$f->variable_fee_percentage->gte(3.5))
-              ->sort(Resource::$f->name->asc())
-              ->sort(Resource::$f->variable_fee_percentage->desc())
-              ->limit(101);
-        $this->assertEquals(
-            $query->filters,
-            array(
-                'name' => array('Wonka Chocs'),
-                'support_email[contains]' => array('gmail.com'),
-                'variable_fee_percentage[>=]'=> array(3.5)
-                )
-            );
-        $this->assertEquals(
-            $query->sorts,
-            array('name,asc', 'variable_fee_percentage,desc')
-            );
-        $this->assertEquals(
-            $query->size,
-            101
-            );
-    }
-}
-
-class PageTest extends \PHPUnit_Framework_TestCase
-{
-    public function testConstruct()
-    {
-        $data = new \stdClass();
-        $data->first_uri = 'some/first/uri';
-        $data->previous_uri = 'some/previous/uri';
-        $data->next_uri = null;
-        $data->last_uri = 'some/last/uri';
-        $data->limit= 25;
-        $data->offset = 0;
-        $data->total = 101;
-        $data->items = array();
-
-        $page = new Page(
-            'Resource',
-            '/some/uri',
-            $data
-            );
-
-        $this->assertEquals($page->resource, 'Resource');
-        $this->assertEquals($page->total, 101);
-        $this->assertEquals($page->items, array());
-        $this->assertTrue($page->hasPrevious());
-        $this->assertFalse($page->hasNext());
-    }
-}
-
-class ResourceTest extends \PHPUnit_Framework_TestCase
-{
-    public function testQuery()
-    {
-        $query = A::query();
-        $this->assertEquals(get_class($query), 'RESTful\Query');
-    }
-
-    public function testObjectify()
-    {
-        $a = new A(array(
-            'uri' => '/as/123',
-            'field1' => 123,
-            'b' => array(
-                'uri' => '/bs/321',
-                'field2' => 321
-            ))
-        );
-        $this->assertEquals(get_class($a), 'RESTful\Test\A');
-        $this->assertEquals($a->field1, 123);
-        $this->assertEquals(get_class($a->b), 'RESTful\Test\B');
-        $this->assertEquals($a->b->field2, 321);
-    }
-}

externals/restful/tests/phpunit.xml

@@ -1,8 +0,0 @@
-<phpunit>
-    <testsuite name="RESTful">
-        <directory>.</directory>
-    </testsuite>
-    <logging>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>
-    </logging>
-</phpunit>

externals/wepay/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (C) 2013, WePay, Inc. <api at wepay dot com>
-
-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.

externals/wepay/README.md

@@ -1,85 +0,0 @@
-WePay PHP SDK
-=============
-
-WePay's API allows you to easily add payments into your application.
-
-For full documentation, see [WePay's developer documentation](https://www.wepay.com/developer)
-
-Usage
------
-
-In addition to the samples below, we have included a very basic demo application in the `demoapp` directory. See its README file for additional information.
-
-### Configuration ###
-
-For all requests, you must initialize the SDK with your Client ID and Client Secret, into either Staging or Production mode. All API calls made against WePay's staging environment mirror production in functionality, but do not actually move money. This allows you to develop your application and test the checkout experience from the perspective of your users without spending any money on payments.  Our [full documentation](https://www.wepay.com/developer) contains additional information on test account numbers you can use in addition to "magic" amounts you can use to trigger payment failures and reversals (helpful for testing IPNs).
-
-**Note:** Staging and Production are two completely independent environments and share NO data with each other. This means that in order to use staging, you must register at [stage.wepay.com](https://stage.wepay.com/developer) and get a set of API keys for your Staging application, and must do the same on Production when you are ready to go live. API keys and access tokens granted on stage *can not* be used on Production, and vice-versa.
-
-    <?php
-    require './wepay.php';
-    WePay::useProduction('YOUR CLIENT ID', 'YOUR CLIENT SECRET'); // To initialize staging, use WePay::useStaging('ID','SECRET'); instead.
-
-### Authentication ###
-
-To obtain an access token for your user, you must redirect the user to WePay for authentication. WePay uses OAuth2 for authorization, which is detailed [in our documentation](https://www.wepay.com/developer/reference/oauth2). To generate the URI to which you must redirect your user, the SDK contains `WePay::getAuthorizationUri($scope, $redirect_uri)`. `$scope` should be an array of scope strings detailed in the documentation. To request full access (most useful for testing, since users may be weary of granting permission to your application if it wants to do too much), you pay pass in `WePay::getAllScopes()`. `$redirect_uri` must be a fully qualified URI where we will send the user after permission is granted (or not granted), and the domain must match your application settings.
-
-If the user grants permission, he or she will be redirected to your `$redirect_uri` with `code=XXXX` appended to the query string. If permission is not granted, we will instead put `error=XXXX` in the query string. If `code` is present, the following will exchange it for an access token. Note that codes are only valid for several minutes, so you should do this immediately after the user is redirected back to your website or application.
-
-    <?php
-	if (!empty($_GET['error'])) {
-		// user did not grant permissions
-	}
-	elseif (empty($_GET['code'])) {
-		// set $scope and $redirect_uri before doing this
-		// this will send the user to WePay to authenticate
-		$uri = WePay::getAuthorizationUri($scope, $redirect_uri);
-		header("Location: $uri");
-		exit;
-	}
-	else {
-		$info = WePay::getToken($_GET['code'], $redirect_uri);
-		if ($info) {
-			// YOUR ACCESS TOKEN IS HERE
-			$access_token = $info->access_token;
-		}
-		else {
-			// Unable to obtain access token
-		}
-	}
-
-Full details on the access token response are [here](https://www.wepay.com/developer/reference/oauth2#token).
-
-**Note:** If you only need access for yourself (e.g., for a personal storefront), the application settings page automatically creates an access token for you. Simply copy and paste it into your code rather than manually going through the authentication flow.
-
-### Making API Calls ###
-
-With the `$access_token` from above, get a new SDK object:
-
-    <?php
-    $wepay = new WePay($access_token);
-
-Then you can make a simple API call. This will list the user's accounts available to your application:
-
-	// (continued from above)
-	try {
-		$accounts = $wepay->request('account/find');
-		foreach ($accounts as $account) {
-			echo "<a href=\"$account->account_uri\">$account->name</a>: $account->description <br />";
-		}
-	}
-	catch (WePayException $e) {
-		// Something went wrong - normally you would log
-		// this and give your user a more informative message
-		echo $e->getMessage();
-	}
-
-And that's it!  For more detail on what API calls are available, their parameters and responses, and what permissions they require, please see [our documentation](https://www.wepay.com/developer/reference). For some more detailed examples, look in the `demoapp` directory and check the README. Dropping the entire directory in a web-accessible location and adding your API keys should allow you to be up and running in just a few seconds.
-
-### SSL Certificate ###
-
-If making an API call causes the following problem:
-
-	Uncaught exception 'Exception' with message 'cURL error while making API call to WePay: SSL certificate problem, verify that the CA cert is OK. Details: error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed'
-
-You can read the solution here: https://support.wepay.com/entries/21095813-problem-with-ssl-certificate-verification

externals/wepay/composer.json

@@ -1,13 +0,0 @@
-{
-	"name": "wepay/php-sdk",
-	"description": "WePay APIv2 SDK for PHP",
-	"authors": [
-		{
-			"name": "WePay",
-			"email": "api@wepay.com"
-		}
-	],
-	"autoload": {
-		"files": ["wepay.php"]
-	}
-}

externals/wepay/demoapp/README

@@ -1,19 +0,0 @@
-After registering your application at wepay.com (or stage.wepay.com), you
-need to make two updates to this application:
-
-1 - set your client_id and client_secret in _shared.php
-2 - set the redirect_uri in login.php
-
-That should be enough to start making API calls against WePay's API.  While
-this is by no means a production-ready example, it should provide you a 
-couple ideas on how to get running.
-
-It also defaults to requesting all possible scope fields in the
-authentication request. We suggest limiting the request to the minimum
-your application requires, which will maximize the chance the user
-grants permissions to your application. You can customize this in
-login.php.
-
-If you have any questions, please contact the API team: api@wepay.com
-
-- WePay

externals/wepay/demoapp/_shared.php

@@ -1,4 +0,0 @@
-<?php
-require '../wepay.php';
-Wepay::useStaging('YOUR CLIENT ID', 'YOUR CLIENT SECRET');
-session_start();

externals/wepay/demoapp/accountlist.php

@@ -1,20 +0,0 @@
-<?php
-require './_shared.php';
-?>
-<h1>WePay Demo App: Account List</h1>
-<a href="index.php">Back</a>
-<br />
-
-<?php
-try {
-	$wepay = new WePay($_SESSION['wepay_access_token']);
-	$accounts = $wepay->request('account/find');
-	foreach ($accounts as $account) {
-		echo "<a href=\"$account->account_uri\">$account->name</a>: $account->description <br />";
-	}
-}
-catch (WePayException $e) {
-	// Something went wrong - normally you would log
-	// this and give your user a more informative message
-	echo $e->getMessage();
-}

externals/wepay/demoapp/index.php

@@ -1,20 +0,0 @@
-<?php
-require './_shared.php';
-?>
-
-<h1>WePay Demo App</h1>
-<?php if (empty($_SESSION['wepay_access_token'])): ?>
-
-<a href="login.php">Log in with WePay</a>
-
-<?php else: ?>
-
-<a href="user.php">User info</a>
-<br />
-<a href="openaccount.php">Open new account</a>
-<br />
-<a href="accountlist.php">Account list</a>
-<br />
-<a href="logout.php">Log out</a>
-
-<?php endif; ?>

externals/wepay/demoapp/login.php

@@ -1,41 +0,0 @@
-<?php
-require './_shared.php';
-
-// ** YOU MUST CHANGE THIS FOR THE SAMPLE APP TO WORK **
-$redirect_uri = 'http://YOUR SERVER NAME/login.php';
-$scope = WePay::getAllScopes();
-
-// If we are already logged in, send the user home
-if (!empty($_SESSION['wepay_access_token'])) {
-	header('Location: index.php');
-	exit;
-}
-
-// If the authentication dance returned an error, catch it to avoid a
-// redirect loop. This usually indicates some sort of application issue,
-// like a domain mismatch on your redirect_uri
-if (!empty($_GET['error'])) {
-	echo 'Error during user authentication: ';
-	echo htmlentities($_GET['error_description']);
-	exit;
-}
-
-// If we don't have a code from being redirected back here,
-// send the user to WePay to grant permissions.
-if (empty($_GET['code'])) {
-	$uri = WePay::getAuthorizationUri($scope, $redirect_uri);
-	header("Location: $uri");
-}
-else {
-	$info = WePay::getToken($_GET['code'], $redirect_uri);
-	if ($info) {
-		// Normally you'd integrate this into your existing auth system
-		$_SESSION['wepay_access_token'] = $info->access_token;
-		// If desired, you can also store $info->user_id somewhere
-		header('Location: index.php');
-	}
-	else {
-		// Unable to obtain access token
-		echo 'Unable to obtain access token from WePay.';
-	}
-}

externals/wepay/demoapp/logout.php

@@ -1,6 +0,0 @@
-<?php
-session_start();
-$_SESSION = array();
-session_destroy();
-header('Location: index.php');
-exit;

externals/wepay/demoapp/openaccount.php

@@ -1,50 +0,0 @@
-<?php
-require './_shared.php';
-?>
-<h1>WePay Demo App: Open Account</h1>
-<a href="index.php">Back</a>
-<br />
-
-<?php
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	if (isset($_POST['account_name']) && isset($_POST['account_description'])) {
-		// WePay sanitizes its own data, but displaying raw POST data on your own site is a XSS security hole.
-		$name = htmlentities($_POST['account_name']);
-		$desc = htmlentities($_POST['account_description']);
-		try {
-			$wepay = new WePay($_SESSION['wepay_access_token']);
-			$account = $wepay->request('account/create', array(
-				'name' => $name,
-				'description' => $desc,
-			));
-			echo "Created account $name for '$desc'! View on WePay at <a href=\"$account->account_uri\">$account->account_uri</a>. See all of your accounts <a href=\"accountlist.php\">here</a>.";
-		}
-		catch (WePayException $e) {
-			// Something went wrong - normally you would log
-			// this and give your user a more informative message
-			echo $e->getMessage();
-		}
-	}
-	else {
-		echo 'Account name and description are both required.';
-	}
-}
-?>
-
-<form method="post">
-	<fieldset>
-		<legend>Account Info</legend>
-
-		<label for="account_name">Account Name:</label><br />
-		<input type="text" id="account_name" name="account_name" placeholder="Ski Trip Savings"/>
-
-		<br /><br />
-
-		<label for="account_description">Account Description: </label><br />
-		<textarea name="account_description" rows="10" cols="40" placeholder="Saving up some dough for our ski trip!"></textarea>
-
-		<br /><br />
-
-		<input type="submit" value="Open account" />
-	</fieldset>
-</form>

externals/wepay/demoapp/user.php

@@ -1,22 +0,0 @@
-<?php
-require './_shared.php';
-?>
-<h1>WePay Demo App: User Info</h1>
-<a href="index.php">Back</a>
-<br />
-
-<?php
-try {
-	$wepay = new WePay($_SESSION['wepay_access_token']);
-	$user = $wepay->request('user');
-	echo '<dl>';
-	foreach ($user as $key => $value) {
-		echo "<dt>$key</dt><dd>$value</dd>";
-	}
-	echo '</dl>';
-}
-catch (WePayException $e) {
-	// Something went wrong - normally you would log
-	// this and give your user a more informative message
-	echo $e->getMessage();
-}

externals/wepay/iframe_demoapp/checkout.php

@@ -1,69 +0,0 @@
-<?php
-/**
- * This PHP script helps you do the iframe checkout
- *
- */
-
-
-/**
- * Put your API credentials here:
- * Get these from your API app details screen
- * https://stage.wepay.com/app
- */
-$client_id = "PUT YOUR CLIENT_ID HERE";
-$client_secret = "PUT YOUR CLIENT_SECRET HERE";
-$access_token = "PUT YOUR ACCESS TOKEN HERE";
-$account_id = "PUT YOUR ACCOUNT_ID HERE"; // you can find your account ID via list_accounts.php which users the /account/find call
-
-/** 
- * Initialize the WePay SDK object 
- */
-require '../wepay.php';
-Wepay::useStaging($client_id, $client_secret);
-$wepay = new WePay($access_token);
-
-/**
- * Make the API request to get the checkout_uri
- * 
- */
-try {
-	$checkout = $wepay->request('/checkout/create', array(
-			'account_id' => $account_id, // ID of the account that you want the money to go to
-			'amount' => 100, // dollar amount you want to charge the user
-			'short_description' => "this is a test payment", // a short description of what the payment is for
-			'type' => "GOODS", // the type of the payment - choose from GOODS SERVICE DONATION or PERSONAL
-			'mode' => "iframe", // put iframe here if you want the checkout to be in an iframe, regular if you want the user to be sent to WePay
-		)
-	);
-} catch (WePayException $e) { // if the API call returns an error, get the error message for display later
-	$error = $e->getMessage();
-}
-
-?>
-
-<html>
-	<head>
-	</head>
-	
-	<body>
-		
-		<h1>Checkout:</h1>
-		
-		<p>The user will checkout here:</p>
-		
-		<?php if (isset($error)): ?>
-			<h2 style="color:red">ERROR: <?php echo $error ?></h2>
-		<?php else: ?>
-			<div id="checkout_div"></div>
-		
-			<script type="text/javascript" src="https://stage.wepay.com/js/iframe.wepay.js">
-			</script>
-			
-			<script type="text/javascript">
-			WePay.iframe_checkout("checkout_div", "<?php echo $checkout->checkout_uri ?>");
-			</script>
-		<?php endif; ?>
-	
-	</body>
-	
-</html>

externals/wepay/iframe_demoapp/list_accounts.php

@@ -1,74 +0,0 @@
-<?php
-/**
- * This PHP script helps you find your account_id
- *
- */
-
-
-
-/**
- * Put your API credentials here:
- * Get these from your API app details screen
- * https://stage.wepay.com/app
- */
-$client_id = "PUT YOUR CLIENT_ID HERE";
-$client_secret = "PUT YOUR CLIENT_SECRET HERE";
-$access_token = "PUT YOUR ACCESS TOKEN HERE";
-
-/** 
- * Initialize the WePay SDK object 
- */
-require '../wepay.php';
-Wepay::useStaging($client_id, $client_secret);
-$wepay = new WePay($access_token);
-
-/**
- * Make the API request to get a list of all accounts this user owns
- * 
- */
-try {
-	$accounts = $wepay->request('/account/find');
-} catch (WePayException $e) { // if the API call returns an error, get the error message for display later
-	$error = $e->getMessage();
-}
-
-?>
-
-<html>
-	<head>
-	</head>
-	
-	<body>
-		
-		<h1>List all accounts:</h1>
-		
-		<p>The following is a list of all accounts that this user owns</p>
-		
-		<?php if (isset($error)): ?>
-			<h2 style="color:red">ERROR: <?php echo $error ?></h2>
-		<?php elseif (empty($accounts)) : ?>
-			<h2>You do not have any accounts. Go to <a href="https://stage.wepay.com.com">https://stage.wepay.com</a> to open an account.<h2>
-		<?php else: ?>
-			<table border="1">
-				<thead>
-					<tr>
-						<td>Account ID</td>
-						<td>Account Name</td>
-						<td>Account Description</td>
-					</tr>
-				</thead>
-				<tbody>
-				<?php foreach ($accounts as $a): ?>
-					<tr>
-						<td><?php echo $a->account_id ?></td>
-						<td><?php echo $a->name ?></td>
-						<td><?php echo $a->description ?></td>
-					</tr>
-				<?php endforeach;?>
-				</tbody>
-			</table>
-		<?php endif; ?>
-	
-	</body>
-	
-</html>

externals/wepay/wepay.php

@@ -1,291 +0,0 @@
-<?php
-
-class WePay {
-
-	/**
-	 * Version number - sent in user agent string
-	 */
-	const VERSION = '0.1.4';
-
-	/**
-	 * Scope fields
-	 * Passed into Wepay::getAuthorizationUri as array
-	 */
-	const SCOPE_MANAGE_ACCOUNTS     = 'manage_accounts';     // Open and interact with accounts
-	const SCOPE_VIEW_BALANCE        = 'view_balance';        // View account balances
-	const SCOPE_COLLECT_PAYMENTS    = 'collect_payments';    // Create and interact with checkouts
-	const SCOPE_VIEW_USER           = 'view_user';           // Get details about authenticated user
-	const SCOPE_PREAPPROVE_PAYMENTS = 'preapprove_payments'; // Create and interact with preapprovals
-	const SCOPE_SEND_MONEY          = 'send_money';          // For withdrawals
-
-	/**
-	 * Application's client ID
-	 */
-	private static $client_id;
-
-	/**
-	 * Application's client secret
-	 */
-	private static $client_secret;
-
-	/**
-	 * @deprecated Use WePay::getAllScopes() instead.
-	 */
-	public static $all_scopes = array(
-		self::SCOPE_MANAGE_ACCOUNTS,
-		self::SCOPE_VIEW_BALANCE,
-		self::SCOPE_COLLECT_PAYMENTS,
-		self::SCOPE_PREAPPROVE_PAYMENTS,
-		self::SCOPE_VIEW_USER,
-		self::SCOPE_SEND_MONEY,
-	);
-
-	/**
-	 * Determines whether to use WePay's staging or production servers
-	 */
-	private static $production = null;
-
-	/**
-	 * cURL handle
-	 */
-	private static $ch = NULL;
-
-	/**
-	 * Authenticated user's access token
-	 */
-	private $token;
-
-	/**
-	 * Pass WePay::getAllScopes() into getAuthorizationUri if your application desires full access
-	 */
-	public static function getAllScopes() {
-		return array(
-			self::SCOPE_MANAGE_ACCOUNTS,
-			self::SCOPE_VIEW_BALANCE,
-			self::SCOPE_COLLECT_PAYMENTS,
-			self::SCOPE_PREAPPROVE_PAYMENTS,
-			self::SCOPE_VIEW_USER,
-			self::SCOPE_SEND_MONEY,
-		);
-	}
-
-	/**
-	 * Generate URI used during oAuth authorization
-	 * Redirect your user to this URI where they can grant your application
-	 * permission to make API calls
-	 * @link https://www.wepay.com/developer/reference/oauth2
-	 * @param array  $scope             List of scope fields for which your application wants access
-	 * @param string $redirect_uri      Where user goes after logging in at WePay (domain must match application settings)
-	 * @param array  $options optional  user_name,user_email which will be pre-filled on login form, state to be returned in querystring of redirect_uri
-	 * @return string URI to which you must redirect your user to grant access to your application
-	 */
-	public static function getAuthorizationUri(array $scope, $redirect_uri, array $options = array()) {
-		// This does not use WePay::getDomain() because the user authentication
-		// domain is different than the API call domain
-		if (self::$production === null) {
-			throw new RuntimeException('You must initialize the WePay SDK with WePay::useStaging() or WePay::useProduction()');
-		}
-		$domain = self::$production ? 'https://www.wepay.com' : 'https://stage.wepay.com';
-		$uri = $domain . '/v2/oauth2/authorize?';
-		$uri .= http_build_query(array(
-			'client_id'    => self::$client_id,
-			'redirect_uri' => $redirect_uri,
-			'scope'        => implode(',', $scope),
-			'state'        => empty($options['state'])      ? '' : $options['state'],
-			'user_name'    => empty($options['user_name'])  ? '' : $options['user_name'],
-			'user_email'   => empty($options['user_email']) ? '' : $options['user_email'],
-		), '', '&');
-		return $uri;
-	}
-
-	private static function getDomain() {
-		if (self::$production === true) {
-			return 'https://wepayapi.com/v2/';
-		}
-		elseif (self::$production === false) {
-			return 'https://stage.wepayapi.com/v2/';
-		}
-		else {
-			throw new RuntimeException('You must initialize the WePay SDK with WePay::useStaging() or WePay::useProduction()');
-		}
-	}
-
-	/**
-	 * Exchange a temporary access code for a (semi-)permanent access token
-	 * @param string $code          'code' field from query string passed to your redirect_uri page
-	 * @param string $redirect_uri  Where user went after logging in at WePay (must match value from getAuthorizationUri)
-	 * @return StdClass|false
-	 *  user_id
-	 *  access_token
-	 *  token_type
-	 */
-	public static function getToken($code, $redirect_uri) {
-		$params = (array(
-			'client_id'     => self::$client_id,
-			'client_secret' => self::$client_secret,
-			'redirect_uri'  => $redirect_uri,
-			'code'          => $code,
-			'state'         => '', // do not hardcode
-		));
-		$result = self::make_request('oauth2/token', $params);
-		return $result;
-	}
-
-	/**
-	 * Configure SDK to run against WePay's production servers
-	 * @param string $client_id      Your application's client id
-	 * @param string $client_secret  Your application's client secret
-	 * @return void
-	 * @throws RuntimeException
-	 */
-	public static function useProduction($client_id, $client_secret) {
-		if (self::$production !== null) {
-			throw new RuntimeException('API mode has already been set.');
-		}
-		self::$production    = true;
-		self::$client_id     = $client_id;
-		self::$client_secret = $client_secret;
-	}
-
-	/**
-	 * Configure SDK to run against WePay's staging servers
-	 * @param string $client_id      Your application's client id
-	 * @param string $client_secret  Your application's client secret
-	 * @return void
-	 * @throws RuntimeException
-	 */
-	public static function useStaging($client_id, $client_secret) {
-		if (self::$production !== null) {
-			throw new RuntimeException('API mode has already been set.');
-		}
-		self::$production    = false;
-		self::$client_id     = $client_id;
-		self::$client_secret = $client_secret;
-	}
-
-	/**
-	 * Create a new API session
-	 * @param string $token - access_token returned from WePay::getToken
-	 */
-	public function __construct($token) {
-		if ($token && !is_string($token)) {
-			throw new InvalidArgumentException('$token must be a string, ' . gettype($token) . ' provided');
-		}
-		$this->token = $token;
-	}
-
-	/**
-	 * Clean up cURL handle
-	 */
-	public function __destruct() {
-		if (self::$ch) {
-			curl_close(self::$ch);
-			self::$ch = NULL;
-		}
-	}
-	
-	/**
-	 * create the cURL request and execute it
-	 */
-	private static function make_request($endpoint, $values, $headers = array())
-	{
-		self::$ch = curl_init();
-		$headers = array_merge(array("Content-Type: application/json"), $headers); // always pass the correct Content-Type header
-		curl_setopt(self::$ch, CURLOPT_USERAGENT, 'WePay v2 PHP SDK v' . self::VERSION);
-		curl_setopt(self::$ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt(self::$ch, CURLOPT_HTTPHEADER, $headers);
-		curl_setopt(self::$ch, CURLOPT_TIMEOUT, 30); // 30-second timeout, adjust to taste
-		curl_setopt(self::$ch, CURLOPT_POST, !empty($values)); // WePay's API is not strictly RESTful, so all requests are sent as POST unless there are no request values
-		
-		$uri = self::getDomain() . $endpoint;
-		curl_setopt(self::$ch, CURLOPT_URL, $uri);
-		
-		if (!empty($values)) {
-			curl_setopt(self::$ch, CURLOPT_POSTFIELDS, json_encode($values));
-		}
-		
-		$raw = curl_exec(self::$ch);
-		if ($errno = curl_errno(self::$ch)) {
-			// Set up special handling for request timeouts
-			if ($errno == CURLE_OPERATION_TIMEOUTED) {
-				throw new WePayServerException("Timeout occurred while trying to connect to WePay");
-			}
-			throw new Exception('cURL error while making API call to WePay: ' . curl_error(self::$ch), $errno);
-		}
-		$result = json_decode($raw);
-		$httpCode = curl_getinfo(self::$ch, CURLINFO_HTTP_CODE);
-		if ($httpCode >= 400) {
-			if (!isset($result->error_code)) {
-				throw new WePayServerException("WePay returned an error response with no error_code, please alert api@wepay.com. Original message: $result->error_description", $httpCode, $result, 0);
-			}
-			if ($httpCode >= 500) {
-				throw new WePayServerException($result->error_description, $httpCode, $result, $result->error_code);
-			}
-			switch ($result->error) {
-				case 'invalid_request':
-					throw new WePayRequestException($result->error_description, $httpCode, $result, $result->error_code);
-				case 'access_denied':
-				default:
-					throw new WePayPermissionException($result->error_description, $httpCode, $result, $result->error_code);
-			}
-		}
-		
-		return $result;
-	}
-
-	/**
-	 * Make API calls against authenticated user
-	 * @param string $endpoint - API call to make (ex. 'user', 'account/find')
-	 * @param array  $values   - Associative array of values to send in API call
-	 * @return StdClass
-	 * @throws WePayException on failure
-	 * @throws Exception on catastrophic failure (non-WePay-specific cURL errors)
-	 */
-	public function request($endpoint, array $values = array()) {
-		$headers = array();
-		
-		if ($this->token) { // if we have an access_token, add it to the Authorization header
-			$headers[] = "Authorization: Bearer $this->token";
-		}
-		
-		$result = self::make_request($endpoint, $values, $headers);
-		
-		return $result;
-	}
-}
-
-/**
- * Different problems will have different exception types so you can
- * catch and handle them differently.
- *
- * WePayServerException indicates some sort of 500-level error code and
- * was unavoidable from your perspective. You may need to re-run the
- * call, or check whether it was received (use a "find" call with your
- * reference_id and make a decision based on the response)
- *
- * WePayRequestException indicates a development error - invalid endpoint,
- * erroneous parameter, etc.
- *
- * WePayPermissionException indicates your authorization token has expired,
- * was revoked, or is lacking in scope for the call you made
- */
-class WePayException extends Exception {
-	public function __construct($description = '', $http_code = FALSE, $response = FALSE, $code = 0, $previous = NULL)
-	{
-		$this->response = $response;
-
-		if (!defined('PHP_VERSION_ID')) {
-			$version = explode('.', PHP_VERSION);
-			define('PHP_VERSION_ID', ($version[0] * 10000 + $version[1] * 100 + $version[2]));
-		}
-
-		if (PHP_VERSION_ID < 50300) {
-			parent::__construct($description, $code);
-		} else {
-			parent::__construct($description, $code, $previous);
-		}
-	}
-}
-class WePayRequestException extends WePayException {}
-class WePayPermissionException extends WePayException {}
-class WePayServerException extends WePayException {}

resources/celerity/map.php

@@ -10,7 +10,7 @@ return array(
     'conpherence.pkg.css' => '3c8a0668',
     'conpherence.pkg.js' => '020aebcf',
     'core.pkg.css' => '3dc188c0',
-    'core.pkg.js' => '9ac8af68',
+    'core.pkg.js' => 'ee320ca2',
     'differential.pkg.css' => '8d8360fb',
     'differential.pkg.js' => '67e02996',
     'diffusion.pkg.css' => '42c75c37',
@@ -244,7 +244,7 @@ return array(
     'rsrc/externals/javelin/lib/Leader.js' => '0d2490ce',
     'rsrc/externals/javelin/lib/Mask.js' => '7c4d8998',
     'rsrc/externals/javelin/lib/Quicksand.js' => 'd3799cb4',
-    'rsrc/externals/javelin/lib/Request.js' => '91863989',
+    'rsrc/externals/javelin/lib/Request.js' => '84e6891f',
     'rsrc/externals/javelin/lib/Resource.js' => '740956e1',
     'rsrc/externals/javelin/lib/Routable.js' => '6a18c42e',
     'rsrc/externals/javelin/lib/Router.js' => '32755edb',
@@ -389,6 +389,7 @@ return array(
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'c715c123',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '6a85bc5a',
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '47a0728b',
+    'rsrc/js/application/fact/Chart.js' => 'fcb0c07d',
     'rsrc/js/application/files/behavior-document-engine.js' => '243d6c22',
     'rsrc/js/application/files/behavior-icon-composer.js' => '38a6cedb',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => 'a17b84f1',
@@ -397,7 +398,8 @@ return array(
     'rsrc/js/application/herald/PathTypeahead.js' => 'ad486db3',
     'rsrc/js/application/herald/herald-rule-editor.js' => '0922e81d',
     'rsrc/js/application/maniphest/behavior-batch-selector.js' => '139ef688',
-    'rsrc/js/application/maniphest/behavior-line-chart.js' => 'c8147a20',
+    'rsrc/js/application/maniphest/behavior-line-chart-legacy.js' => 'faf3ab6b',
+    'rsrc/js/application/maniphest/behavior-line-chart.js' => 'ad258e28',
     'rsrc/js/application/maniphest/behavior-list-edit.js' => 'c687e867',
     'rsrc/js/application/owners/OwnersPathEditor.js' => '2a8b62d9',
     'rsrc/js/application/owners/owners-path-editor.js' => 'ff688a7a',
@@ -625,7 +627,8 @@ return array(
     'javelin-behavior-icon-composer' => '38a6cedb',
     'javelin-behavior-launch-icon-composer' => 'a17b84f1',
     'javelin-behavior-lightbox-attachments' => 'c7e748bf',
-    'javelin-behavior-line-chart' => 'c8147a20',
+    'javelin-behavior-line-chart' => 'ad258e28',
+    'javelin-behavior-line-chart-legacy' => 'faf3ab6b',
     'javelin-behavior-linked-container' => '74446546',
     'javelin-behavior-maniphest-batch-selector' => '139ef688',
     'javelin-behavior-maniphest-list-editor' => 'c687e867',
@@ -695,6 +698,7 @@ return array(
     'javelin-behavior-user-menu' => '60cd9241',
     'javelin-behavior-view-placeholder' => 'a9942052',
     'javelin-behavior-workflow' => '9623adc1',
+    'javelin-chart' => 'fcb0c07d',
     'javelin-color' => '78f811c9',
     'javelin-cookie' => '05d290ef',
     'javelin-diffusion-locate-file-source' => '94243d89',
@@ -713,7 +717,7 @@ return array(
     'javelin-reactor-dom' => '6cfa0008',
     'javelin-reactor-node-calmer' => '225bbb98',
     'javelin-reactornode' => '72960bc1',
-    'javelin-request' => '91863989',
+    'javelin-request' => '84e6891f',
     'javelin-resource' => '740956e1',
     'javelin-routable' => '6a18c42e',
     'javelin-router' => '32755edb',
@@ -1591,6 +1595,16 @@ return array(
       'javelin-dom',
       'javelin-vector',
     ),
+    '84e6891f' => array(
+      'javelin-install',
+      'javelin-stratcom',
+      'javelin-util',
+      'javelin-behavior',
+      'javelin-json',
+      'javelin-dom',
+      'javelin-resource',
+      'javelin-routable',
+    ),
     '87428eb2' => array(
       'javelin-behavior',
       'javelin-diffusion-locate-file-source',
@@ -1647,16 +1661,6 @@ return array(
       'javelin-workflow',
       'javelin-stratcom',
     ),
-    91863989 => array(
-      'javelin-install',
-      'javelin-stratcom',
-      'javelin-util',
-      'javelin-behavior',
-      'javelin-json',
-      'javelin-dom',
-      'javelin-resource',
-      'javelin-routable',
-    ),
     '91befbcc' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1855,6 +1859,11 @@ return array(
       'javelin-request',
       'javelin-router',
     ),
+    'ad258e28' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-chart',
+    ),
     'ad486db3' => array(
       'javelin-install',
       'javelin-typeahead',
@@ -1997,12 +2006,6 @@ return array(
       'phuix-icon-view',
       'phabricator-busy',
     ),
-    'c8147a20' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-vector',
-      'phui-chart-css',
-    ),
     'c9749dcd' => array(
       'javelin-install',
       'javelin-util',
@@ -2179,6 +2182,16 @@ return array(
     'fa74cc35' => array(
       'phui-oi-list-view-css',
     ),
+    'faf3ab6b' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-vector',
+      'phui-chart-css',
+    ),
+    'fcb0c07d' => array(
+      'phui-chart-css',
+      'd3',
+    ),
     'fdc13e4e' => array(
       'javelin-install',
     ),

resources/sql/autopatches/20140722.appname.php

@@ -81,21 +81,8 @@ foreach ($applications as $application) {
 
 /* -(  Dashboard installs  )------------------------------------------------- */
 
-echo pht('Migrating dashboard installs...')."\n";
-$table = new PhabricatorDashboardInstall();
-$conn_w = $table->establishConnection('w');
-
-foreach (new LiskMigrationIterator($table) as $dashboard_install) {
-  $application = $dashboard_install->getApplicationClass();
-
-  queryfx(
-    $conn_w,
-    'UPDATE %T SET applicationClass = %s WHERE id = %d',
-    $table->getTableName(),
-    idx($map, $application, $application),
-    $dashboard_install->getID());
-}
-
+// This originally migrated dashboard install locations, but was removed
+// after about 5 years.
 
 /* -(  Phabricator configuration  )------------------------------------------ */
 

resources/sql/autopatches/20190416.chart.01.storage.sql

@@ -0,0 +1,6 @@
+CREATE TABLE {$NAMESPACE}_fact.fact_chart (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  chartKey BINARY(12) NOT NULL,
+  chartParameters LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  UNIQUE KEY `key_chart` (chartKey)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

src/__phutil_library_map__.php

@@ -662,6 +662,7 @@ phutil_register_library_map(array(
     'DifferentialSubscribersCommitMessageField' => 'applications/differential/field/DifferentialSubscribersCommitMessageField.php',
     'DifferentialSummaryCommitMessageField' => 'applications/differential/field/DifferentialSummaryCommitMessageField.php',
     'DifferentialSummaryField' => 'applications/differential/customfield/DifferentialSummaryField.php',
+    'DifferentialTabReplacementTestCase' => 'applications/differential/parser/__tests__/DifferentialTabReplacementTestCase.php',
     'DifferentialTagsCommitMessageField' => 'applications/differential/field/DifferentialTagsCommitMessageField.php',
     'DifferentialTasksCommitMessageField' => 'applications/differential/field/DifferentialTasksCommitMessageField.php',
     'DifferentialTestPlanCommitMessageField' => 'applications/differential/field/DifferentialTestPlanCommitMessageField.php',
@@ -688,7 +689,6 @@ phutil_register_library_map(array(
     'DiffusionBranchListView' => 'applications/diffusion/view/DiffusionBranchListView.php',
     'DiffusionBranchQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionBranchQueryConduitAPIMethod.php',
     'DiffusionBranchTableController' => 'applications/diffusion/controller/DiffusionBranchTableController.php',
-    'DiffusionBranchTableView' => 'applications/diffusion/view/DiffusionBranchTableView.php',
     'DiffusionBrowseController' => 'applications/diffusion/controller/DiffusionBrowseController.php',
     'DiffusionBrowseQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php',
     'DiffusionBrowseResultSet' => 'applications/diffusion/data/DiffusionBrowseResultSet.php',
@@ -765,6 +765,7 @@ phutil_register_library_map(array(
     'DiffusionCommitRevisionAcceptedHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php',
     'DiffusionCommitRevisionAcceptingReviewersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php',
     'DiffusionCommitRevisionHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionHeraldField.php',
+    'DiffusionCommitRevisionQuery' => 'applications/diffusion/query/DiffusionCommitRevisionQuery.php',
     'DiffusionCommitRevisionReviewersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php',
     'DiffusionCommitRevisionSubscribersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionSubscribersHeraldField.php',
     'DiffusionCommitSearchConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionCommitSearchConduitAPIMethod.php',
@@ -773,6 +774,7 @@ phutil_register_library_map(array(
     'DiffusionCommitTimelineEngine' => 'applications/diffusion/engine/DiffusionCommitTimelineEngine.php',
     'DiffusionCommitTransactionType' => 'applications/diffusion/xaction/DiffusionCommitTransactionType.php',
     'DiffusionCommitVerifyTransaction' => 'applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php',
+    'DiffusionCommitWrongBuildsHeraldField' => 'applications/diffusion/herald/DiffusionCommitWrongBuildsHeraldField.php',
     'DiffusionCompareController' => 'applications/diffusion/controller/DiffusionCompareController.php',
     'DiffusionConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionConduitAPIMethod.php',
     'DiffusionController' => 'applications/diffusion/controller/DiffusionController.php',
@@ -813,6 +815,11 @@ phutil_register_library_map(array(
     'DiffusionGitResponse' => 'applications/diffusion/response/DiffusionGitResponse.php',
     'DiffusionGitSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitSSHWorkflow.php',
     'DiffusionGitUploadPackSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php',
+    'DiffusionGitUploadPackWireProtocol' => 'applications/diffusion/protocol/DiffusionGitUploadPackWireProtocol.php',
+    'DiffusionGitWireProtocol' => 'applications/diffusion/protocol/DiffusionGitWireProtocol.php',
+    'DiffusionGitWireProtocolCapabilities' => 'applications/diffusion/protocol/DiffusionGitWireProtocolCapabilities.php',
+    'DiffusionGitWireProtocolRef' => 'applications/diffusion/protocol/DiffusionGitWireProtocolRef.php',
+    'DiffusionGitWireProtocolRefList' => 'applications/diffusion/protocol/DiffusionGitWireProtocolRefList.php',
     'DiffusionGraphController' => 'applications/diffusion/controller/DiffusionGraphController.php',
     'DiffusionHistoryController' => 'applications/diffusion/controller/DiffusionHistoryController.php',
     'DiffusionHistoryListView' => 'applications/diffusion/view/DiffusionHistoryListView.php',
@@ -899,6 +906,7 @@ phutil_register_library_map(array(
     'DiffusionPreCommitContentRevisionHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionHeraldField.php',
     'DiffusionPreCommitContentRevisionReviewersHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php',
     'DiffusionPreCommitContentRevisionSubscribersHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionSubscribersHeraldField.php',
+    'DiffusionPreCommitContentWrongBuildsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentWrongBuildsHeraldField.php',
     'DiffusionPreCommitRefChangeHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefChangeHeraldField.php',
     'DiffusionPreCommitRefHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefHeraldField.php',
     'DiffusionPreCommitRefHeraldFieldGroup' => 'applications/diffusion/herald/DiffusionPreCommitRefHeraldFieldGroup.php',
@@ -930,7 +938,6 @@ phutil_register_library_map(array(
     'DiffusionRefTableController' => 'applications/diffusion/controller/DiffusionRefTableController.php',
     'DiffusionRefsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionRefsQueryConduitAPIMethod.php',
     'DiffusionRenameHistoryQuery' => 'applications/diffusion/query/DiffusionRenameHistoryQuery.php',
-    'DiffusionRepositoryActionsManagementPanel' => 'applications/diffusion/management/DiffusionRepositoryActionsManagementPanel.php',
     'DiffusionRepositoryAutomationManagementPanel' => 'applications/diffusion/management/DiffusionRepositoryAutomationManagementPanel.php',
     'DiffusionRepositoryBasicsManagementPanel' => 'applications/diffusion/management/DiffusionRepositoryBasicsManagementPanel.php',
     'DiffusionRepositoryBranchesManagementPanel' => 'applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php',
@@ -947,6 +954,7 @@ phutil_register_library_map(array(
     'DiffusionRepositoryEditDeleteController' => 'applications/diffusion/controller/DiffusionRepositoryEditDeleteController.php',
     'DiffusionRepositoryEditEngine' => 'applications/diffusion/editor/DiffusionRepositoryEditEngine.php',
     'DiffusionRepositoryEditEnormousController' => 'applications/diffusion/controller/DiffusionRepositoryEditEnormousController.php',
+    'DiffusionRepositoryEditPublishingController' => 'applications/diffusion/controller/DiffusionRepositoryEditPublishingController.php',
     'DiffusionRepositoryEditUpdateController' => 'applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php',
     'DiffusionRepositoryFunctionDatasource' => 'applications/diffusion/typeahead/DiffusionRepositoryFunctionDatasource.php',
     'DiffusionRepositoryHistoryManagementPanel' => 'applications/diffusion/management/DiffusionRepositoryHistoryManagementPanel.php',
@@ -1014,6 +1022,7 @@ phutil_register_library_map(array(
     'DiffusionURIEditor' => 'applications/diffusion/editor/DiffusionURIEditor.php',
     'DiffusionURITestCase' => 'applications/diffusion/request/__tests__/DiffusionURITestCase.php',
     'DiffusionUpdateCoverageConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionUpdateCoverageConduitAPIMethod.php',
+    'DiffusionUpdateObjectAfterCommitWorker' => 'applications/diffusion/worker/DiffusionUpdateObjectAfterCommitWorker.php',
     'DiffusionView' => 'applications/diffusion/view/DiffusionView.php',
     'DivinerArticleAtomizer' => 'applications/diviner/atomizer/DivinerArticleAtomizer.php',
     'DivinerAtom' => 'applications/diviner/atom/DivinerAtom.php',
@@ -1573,6 +1582,7 @@ phutil_register_library_map(array(
     'HeraldTextFieldValue' => 'applications/herald/value/HeraldTextFieldValue.php',
     'HeraldTokenizerFieldValue' => 'applications/herald/value/HeraldTokenizerFieldValue.php',
     'HeraldTransactionQuery' => 'applications/herald/query/HeraldTransactionQuery.php',
+    'HeraldTransactionsFieldGroup' => 'applications/herald/field/HeraldTransactionsFieldGroup.php',
     'HeraldTranscript' => 'applications/herald/storage/transcript/HeraldTranscript.php',
     'HeraldTranscriptController' => 'applications/herald/controller/HeraldTranscriptController.php',
     'HeraldTranscriptDestructionEngineExtension' => 'applications/herald/engineextension/HeraldTranscriptDestructionEngineExtension.php',
@@ -2410,6 +2420,7 @@ phutil_register_library_map(array(
     'PhabricatorAuthTryFactorAction' => 'applications/auth/action/PhabricatorAuthTryFactorAction.php',
     'PhabricatorAuthUnlinkController' => 'applications/auth/controller/PhabricatorAuthUnlinkController.php',
     'PhabricatorAuthValidateController' => 'applications/auth/controller/PhabricatorAuthValidateController.php',
+    'PhabricatorAuthWaitForApprovalMessageType' => 'applications/auth/message/PhabricatorAuthWaitForApprovalMessageType.php',
     'PhabricatorAuthWelcomeMailMessageType' => 'applications/auth/message/PhabricatorAuthWelcomeMailMessageType.php',
     'PhabricatorAuthenticationConfigOptions' => 'applications/config/option/PhabricatorAuthenticationConfigOptions.php',
     'PhabricatorAutoEventListener' => 'infrastructure/events/PhabricatorAutoEventListener.php',
@@ -2644,6 +2655,11 @@ phutil_register_library_map(array(
     'PhabricatorChangeParserTestCase' => 'applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php',
     'PhabricatorChangesetCachePurger' => 'applications/cache/purger/PhabricatorChangesetCachePurger.php',
     'PhabricatorChangesetResponse' => 'infrastructure/diff/PhabricatorChangesetResponse.php',
+    'PhabricatorChartAxis' => 'applications/fact/chart/PhabricatorChartAxis.php',
+    'PhabricatorChartDataQuery' => 'applications/fact/chart/PhabricatorChartDataQuery.php',
+    'PhabricatorChartFunction' => 'applications/fact/chart/PhabricatorChartFunction.php',
+    'PhabricatorChartFunctionArgument' => 'applications/fact/chart/PhabricatorChartFunctionArgument.php',
+    'PhabricatorChartFunctionArgumentParser' => 'applications/fact/chart/PhabricatorChartFunctionArgumentParser.php',
     'PhabricatorChatLogApplication' => 'applications/chatlog/application/PhabricatorChatLogApplication.php',
     'PhabricatorChatLogChannel' => 'applications/chatlog/storage/PhabricatorChatLogChannel.php',
     'PhabricatorChatLogChannelListController' => 'applications/chatlog/controller/PhabricatorChatLogChannelListController.php',
@@ -2795,6 +2811,7 @@ phutil_register_library_map(array(
     'PhabricatorConpherenceWidgetVisibleSetting' => 'applications/settings/setting/PhabricatorConpherenceWidgetVisibleSetting.php',
     'PhabricatorConsoleApplication' => 'applications/console/application/PhabricatorConsoleApplication.php',
     'PhabricatorConsoleContentSource' => 'infrastructure/contentsource/PhabricatorConsoleContentSource.php',
+    'PhabricatorConstantChartFunction' => 'applications/fact/chart/PhabricatorConstantChartFunction.php',
     'PhabricatorContactNumbersSettingsPanel' => 'applications/settings/panel/PhabricatorContactNumbersSettingsPanel.php',
     'PhabricatorContentSource' => 'infrastructure/contentsource/PhabricatorContentSource.php',
     'PhabricatorContentSourceModule' => 'infrastructure/contentsource/PhabricatorContentSourceModule.php',
@@ -2806,6 +2823,7 @@ phutil_register_library_map(array(
     'PhabricatorCoreCreateTransaction' => 'applications/transactions/xaction/PhabricatorCoreCreateTransaction.php',
     'PhabricatorCoreTransactionType' => 'applications/transactions/xaction/PhabricatorCoreTransactionType.php',
     'PhabricatorCoreVoidTransaction' => 'applications/transactions/xaction/PhabricatorCoreVoidTransaction.php',
+    'PhabricatorCosChartFunction' => 'applications/fact/chart/PhabricatorCosChartFunction.php',
     'PhabricatorCountFact' => 'applications/fact/fact/PhabricatorCountFact.php',
     'PhabricatorCountdown' => 'applications/countdown/storage/PhabricatorCountdown.php',
     'PhabricatorCountdownApplication' => 'applications/countdown/application/PhabricatorCountdownApplication.php',
@@ -2994,6 +3012,7 @@ phutil_register_library_map(array(
     'PhabricatorDashboardQueryPanelApplicationEditField' => 'applications/dashboard/editfield/PhabricatorDashboardQueryPanelApplicationEditField.php',
     'PhabricatorDashboardQueryPanelApplicationTransaction' => 'applications/dashboard/xaction/panel/PhabricatorDashboardQueryPanelApplicationTransaction.php',
     'PhabricatorDashboardQueryPanelInstallController' => 'applications/dashboard/controller/PhabricatorDashboardQueryPanelInstallController.php',
+    'PhabricatorDashboardQueryPanelLimitTransaction' => 'applications/dashboard/xaction/panel/PhabricatorDashboardQueryPanelLimitTransaction.php',
     'PhabricatorDashboardQueryPanelQueryEditField' => 'applications/dashboard/editfield/PhabricatorDashboardQueryPanelQueryEditField.php',
     'PhabricatorDashboardQueryPanelQueryTransaction' => 'applications/dashboard/xaction/panel/PhabricatorDashboardQueryPanelQueryTransaction.php',
     'PhabricatorDashboardQueryPanelType' => 'applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php',
@@ -3022,6 +3041,7 @@ phutil_register_library_map(array(
     'PhabricatorDatasourceEditType' => 'applications/transactions/edittype/PhabricatorDatasourceEditType.php',
     'PhabricatorDatasourceEngine' => 'applications/search/engine/PhabricatorDatasourceEngine.php',
     'PhabricatorDatasourceEngineExtension' => 'applications/search/engineextension/PhabricatorDatasourceEngineExtension.php',
+    'PhabricatorDatasourceURIEngineExtension' => 'applications/meta/engineextension/PhabricatorDatasourceURIEngineExtension.php',
     'PhabricatorDateFormatSetting' => 'applications/settings/setting/PhabricatorDateFormatSetting.php',
     'PhabricatorDateTimeSettingsPanel' => 'applications/settings/panel/PhabricatorDateTimeSettingsPanel.php',
     'PhabricatorDebugController' => 'applications/system/controller/PhabricatorDebugController.php',
@@ -3196,7 +3216,9 @@ phutil_register_library_map(array(
     'PhabricatorFact' => 'applications/fact/fact/PhabricatorFact.php',
     'PhabricatorFactAggregate' => 'applications/fact/storage/PhabricatorFactAggregate.php',
     'PhabricatorFactApplication' => 'applications/fact/application/PhabricatorFactApplication.php',
+    'PhabricatorFactChart' => 'applications/fact/storage/PhabricatorFactChart.php',
     'PhabricatorFactChartController' => 'applications/fact/controller/PhabricatorFactChartController.php',
+    'PhabricatorFactChartFunction' => 'applications/fact/chart/PhabricatorFactChartFunction.php',
     'PhabricatorFactController' => 'applications/fact/controller/PhabricatorFactController.php',
     'PhabricatorFactCursor' => 'applications/fact/storage/PhabricatorFactCursor.php',
     'PhabricatorFactDAO' => 'applications/fact/storage/PhabricatorFactDAO.php',
@@ -4284,6 +4306,7 @@ phutil_register_library_map(array(
     'PhabricatorProjectsSearchEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsSearchEngineExtension.php',
     'PhabricatorProjectsWatchersSearchEngineAttachment' => 'applications/project/engineextension/PhabricatorProjectsWatchersSearchEngineAttachment.php',
     'PhabricatorPronounSetting' => 'applications/settings/setting/PhabricatorPronounSetting.php',
+    'PhabricatorProtocolLog' => 'infrastructure/log/PhabricatorProtocolLog.php',
     'PhabricatorPygmentSetupCheck' => 'applications/config/check/PhabricatorPygmentSetupCheck.php',
     'PhabricatorQuery' => 'infrastructure/query/PhabricatorQuery.php',
     'PhabricatorQueryConstraint' => 'infrastructure/query/constraint/PhabricatorQueryConstraint.php',
@@ -4292,7 +4315,6 @@ phutil_register_library_map(array(
     'PhabricatorQueryOrderItem' => 'infrastructure/query/order/PhabricatorQueryOrderItem.php',
     'PhabricatorQueryOrderTestCase' => 'infrastructure/query/order/__tests__/PhabricatorQueryOrderTestCase.php',
     'PhabricatorQueryOrderVector' => 'infrastructure/query/order/PhabricatorQueryOrderVector.php',
-    'PhabricatorQuickSearchEngineExtension' => 'applications/search/engineextension/PhabricatorQuickSearchEngineExtension.php',
     'PhabricatorRateLimitRequestExceptionHandler' => 'aphront/handler/PhabricatorRateLimitRequestExceptionHandler.php',
     'PhabricatorRebuildIndexesWorker' => 'applications/search/worker/PhabricatorRebuildIndexesWorker.php',
     'PhabricatorRecaptchaConfigOptions' => 'applications/config/option/PhabricatorRecaptchaConfigOptions.php',
@@ -4315,20 +4337,17 @@ phutil_register_library_map(array(
     'PhabricatorRepository' => 'applications/repository/storage/PhabricatorRepository.php',
     'PhabricatorRepositoryActivateTransaction' => 'applications/repository/xaction/PhabricatorRepositoryActivateTransaction.php',
     'PhabricatorRepositoryAuditRequest' => 'applications/repository/storage/PhabricatorRepositoryAuditRequest.php',
-    'PhabricatorRepositoryAutocloseOnlyTransaction' => 'applications/repository/xaction/PhabricatorRepositoryAutocloseOnlyTransaction.php',
-    'PhabricatorRepositoryAutocloseTransaction' => 'applications/repository/xaction/PhabricatorRepositoryAutocloseTransaction.php',
     'PhabricatorRepositoryBlueprintsTransaction' => 'applications/repository/xaction/PhabricatorRepositoryBlueprintsTransaction.php',
     'PhabricatorRepositoryBranch' => 'applications/repository/storage/PhabricatorRepositoryBranch.php',
     'PhabricatorRepositoryCallsignTransaction' => 'applications/repository/xaction/PhabricatorRepositoryCallsignTransaction.php',
     'PhabricatorRepositoryCommit' => 'applications/repository/storage/PhabricatorRepositoryCommit.php',
     'PhabricatorRepositoryCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php',
     'PhabricatorRepositoryCommitData' => 'applications/repository/storage/PhabricatorRepositoryCommitData.php',
-    'PhabricatorRepositoryCommitHeraldWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php',
     'PhabricatorRepositoryCommitHint' => 'applications/repository/storage/PhabricatorRepositoryCommitHint.php',
     'PhabricatorRepositoryCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php',
-    'PhabricatorRepositoryCommitOwnersWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php',
     'PhabricatorRepositoryCommitPHIDType' => 'applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php',
     'PhabricatorRepositoryCommitParserWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitParserWorker.php',
+    'PhabricatorRepositoryCommitPublishWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitPublishWorker.php',
     'PhabricatorRepositoryCommitRef' => 'applications/repository/engine/PhabricatorRepositoryCommitRef.php',
     'PhabricatorRepositoryCommitTestCase' => 'applications/repository/storage/__tests__/PhabricatorRepositoryCommitTestCase.php',
     'PhabricatorRepositoryConfigOptions' => 'applications/repository/config/PhabricatorRepositoryConfigOptions.php',
@@ -4344,6 +4363,7 @@ phutil_register_library_map(array(
     'PhabricatorRepositoryEngine' => 'applications/repository/engine/PhabricatorRepositoryEngine.php',
     'PhabricatorRepositoryEnormousTransaction' => 'applications/repository/xaction/PhabricatorRepositoryEnormousTransaction.php',
     'PhabricatorRepositoryFerretEngine' => 'applications/repository/search/PhabricatorRepositoryFerretEngine.php',
+    'PhabricatorRepositoryFetchRefsTransaction' => 'applications/repository/xaction/PhabricatorRepositoryFetchRefsTransaction.php',
     'PhabricatorRepositoryFilesizeLimitTransaction' => 'applications/repository/xaction/PhabricatorRepositoryFilesizeLimitTransaction.php',
     'PhabricatorRepositoryFulltextEngine' => 'applications/repository/search/PhabricatorRepositoryFulltextEngine.php',
     'PhabricatorRepositoryGitCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php',
@@ -4391,6 +4411,9 @@ phutil_register_library_map(array(
     'PhabricatorRepositoryNotifyTransaction' => 'applications/repository/xaction/PhabricatorRepositoryNotifyTransaction.php',
     'PhabricatorRepositoryOldRef' => 'applications/repository/storage/PhabricatorRepositoryOldRef.php',
     'PhabricatorRepositoryParsedChange' => 'applications/repository/data/PhabricatorRepositoryParsedChange.php',
+    'PhabricatorRepositoryPermanentRefsTransaction' => 'applications/repository/xaction/PhabricatorRepositoryPermanentRefsTransaction.php',
+    'PhabricatorRepositoryPublisher' => 'applications/repository/query/PhabricatorRepositoryPublisher.php',
+    'PhabricatorRepositoryPublisherHoldReason' => 'applications/repository/query/PhabricatorRepositoryPublisherHoldReason.php',
     'PhabricatorRepositoryPullEngine' => 'applications/repository/engine/PhabricatorRepositoryPullEngine.php',
     'PhabricatorRepositoryPullEvent' => 'applications/repository/storage/PhabricatorRepositoryPullEvent.php',
     'PhabricatorRepositoryPullEventPHIDType' => 'applications/repository/phid/PhabricatorRepositoryPullEventPHIDType.php',
@@ -4461,6 +4484,7 @@ phutil_register_library_map(array(
     'PhabricatorSSHWorkflow' => 'infrastructure/ssh/PhabricatorSSHWorkflow.php',
     'PhabricatorSavedQuery' => 'applications/search/storage/PhabricatorSavedQuery.php',
     'PhabricatorSavedQueryQuery' => 'applications/search/query/PhabricatorSavedQueryQuery.php',
+    'PhabricatorScaleChartFunction' => 'applications/fact/chart/PhabricatorScaleChartFunction.php',
     'PhabricatorScheduleTaskTriggerAction' => 'infrastructure/daemon/workers/action/PhabricatorScheduleTaskTriggerAction.php',
     'PhabricatorScopedEnv' => 'infrastructure/env/PhabricatorScopedEnv.php',
     'PhabricatorSearchAbstractDocument' => 'applications/search/index/PhabricatorSearchAbstractDocument.php',
@@ -4525,6 +4549,7 @@ phutil_register_library_map(array(
     'PhabricatorSecuritySetupCheck' => 'applications/config/check/PhabricatorSecuritySetupCheck.php',
     'PhabricatorSelectEditField' => 'applications/transactions/editfield/PhabricatorSelectEditField.php',
     'PhabricatorSelectSetting' => 'applications/settings/setting/PhabricatorSelectSetting.php',
+    'PhabricatorSelfHyperlinkEngineExtension' => 'applications/meta/engineextension/PhabricatorSelfHyperlinkEngineExtension.php',
     'PhabricatorSessionsSettingsPanel' => 'applications/settings/panel/PhabricatorSessionsSettingsPanel.php',
     'PhabricatorSetConfigType' => 'applications/config/type/PhabricatorSetConfigType.php',
     'PhabricatorSetting' => 'applications/settings/setting/PhabricatorSetting.php',
@@ -4550,9 +4575,11 @@ phutil_register_library_map(array(
     'PhabricatorSetupIssue' => 'applications/config/issue/PhabricatorSetupIssue.php',
     'PhabricatorSetupIssueUIExample' => 'applications/uiexample/examples/PhabricatorSetupIssueUIExample.php',
     'PhabricatorSetupIssueView' => 'applications/config/view/PhabricatorSetupIssueView.php',
+    'PhabricatorShiftChartFunction' => 'applications/fact/chart/PhabricatorShiftChartFunction.php',
     'PhabricatorShortSite' => 'aphront/site/PhabricatorShortSite.php',
     'PhabricatorShowFiletreeSetting' => 'applications/settings/setting/PhabricatorShowFiletreeSetting.php',
     'PhabricatorSimpleEditType' => 'applications/transactions/edittype/PhabricatorSimpleEditType.php',
+    'PhabricatorSinChartFunction' => 'applications/fact/chart/PhabricatorSinChartFunction.php',
     'PhabricatorSite' => 'aphront/site/PhabricatorSite.php',
     'PhabricatorSlackAuthProvider' => 'applications/auth/provider/PhabricatorSlackAuthProvider.php',
     'PhabricatorSlowvoteApplication' => 'applications/slowvote/application/PhabricatorSlowvoteApplication.php',
@@ -4925,6 +4952,7 @@ phutil_register_library_map(array(
     'PhabricatorWorkingCopyDiscoveryTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyDiscoveryTestCase.php',
     'PhabricatorWorkingCopyPullTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyPullTestCase.php',
     'PhabricatorWorkingCopyTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php',
+    'PhabricatorXChartFunction' => 'applications/fact/chart/PhabricatorXChartFunction.php',
     'PhabricatorXHPASTDAO' => 'applications/phpast/storage/PhabricatorXHPASTDAO.php',
     'PhabricatorXHPASTParseTree' => 'applications/phpast/storage/PhabricatorXHPASTParseTree.php',
     'PhabricatorXHPASTViewController' => 'applications/phpast/controller/PhabricatorXHPASTViewController.php',
@@ -5224,7 +5252,6 @@ phutil_register_library_map(array(
     'PhortuneSubscriptionViewController' => 'applications/phortune/controller/subscription/PhortuneSubscriptionViewController.php',
     'PhortuneSubscriptionWorker' => 'applications/phortune/worker/PhortuneSubscriptionWorker.php',
     'PhortuneTestPaymentProvider' => 'applications/phortune/provider/PhortuneTestPaymentProvider.php',
-    'PhortuneWePayPaymentProvider' => 'applications/phortune/provider/PhortuneWePayPaymentProvider.php',
     'PhragmentBrowseController' => 'applications/phragment/controller/PhragmentBrowseController.php',
     'PhragmentCanCreateCapability' => 'applications/phragment/capability/PhragmentCanCreateCapability.php',
     'PhragmentConduitAPIMethod' => 'applications/phragment/conduit/PhragmentConduitAPIMethod.php',
@@ -5311,6 +5338,7 @@ phutil_register_library_map(array(
     'PhrictionDocumentPathHeraldField' => 'applications/phriction/herald/PhrictionDocumentPathHeraldField.php',
     'PhrictionDocumentPolicyCodex' => 'applications/phriction/codex/PhrictionDocumentPolicyCodex.php',
     'PhrictionDocumentPublishTransaction' => 'applications/phriction/xaction/PhrictionDocumentPublishTransaction.php',
+    'PhrictionDocumentPublishedHeraldField' => 'applications/phriction/herald/PhrictionDocumentPublishedHeraldField.php',
     'PhrictionDocumentQuery' => 'applications/phriction/query/PhrictionDocumentQuery.php',
     'PhrictionDocumentSearchConduitAPIMethod' => 'applications/phriction/conduit/PhrictionDocumentSearchConduitAPIMethod.php',
     'PhrictionDocumentSearchEngine' => 'applications/phriction/query/PhrictionDocumentSearchEngine.php',
@@ -6305,6 +6333,7 @@ phutil_register_library_map(array(
     'DifferentialSubscribersCommitMessageField' => 'DifferentialCommitMessageField',
     'DifferentialSummaryCommitMessageField' => 'DifferentialCommitMessageField',
     'DifferentialSummaryField' => 'DifferentialCoreCustomField',
+    'DifferentialTabReplacementTestCase' => 'PhabricatorTestCase',
     'DifferentialTagsCommitMessageField' => 'DifferentialCommitMessageField',
     'DifferentialTasksCommitMessageField' => 'DifferentialCommitMessageField',
     'DifferentialTestPlanCommitMessageField' => 'DifferentialCommitMessageField',
@@ -6331,7 +6360,6 @@ phutil_register_library_map(array(
     'DiffusionBranchListView' => 'DiffusionView',
     'DiffusionBranchQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
     'DiffusionBranchTableController' => 'DiffusionController',
-    'DiffusionBranchTableView' => 'DiffusionView',
     'DiffusionBrowseController' => 'DiffusionController',
     'DiffusionBrowseQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
     'DiffusionBrowseResultSet' => 'Phobject',
@@ -6408,6 +6436,7 @@ phutil_register_library_map(array(
     'DiffusionCommitRevisionAcceptedHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitRevisionAcceptingReviewersHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitRevisionHeraldField' => 'DiffusionCommitHeraldField',
+    'DiffusionCommitRevisionQuery' => 'Phobject',
     'DiffusionCommitRevisionReviewersHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitRevisionSubscribersHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
@@ -6416,6 +6445,7 @@ phutil_register_library_map(array(
     'DiffusionCommitTimelineEngine' => 'PhabricatorTimelineEngine',
     'DiffusionCommitTransactionType' => 'PhabricatorModularTransactionType',
     'DiffusionCommitVerifyTransaction' => 'DiffusionCommitAuditTransaction',
+    'DiffusionCommitWrongBuildsHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCompareController' => 'DiffusionController',
     'DiffusionConduitAPIMethod' => 'ConduitAPIMethod',
     'DiffusionController' => 'PhabricatorController',
@@ -6459,6 +6489,11 @@ phutil_register_library_map(array(
       'DiffusionRepositoryClusterEngineLogInterface',
     ),
     'DiffusionGitUploadPackSSHWorkflow' => 'DiffusionGitSSHWorkflow',
+    'DiffusionGitUploadPackWireProtocol' => 'DiffusionGitWireProtocol',
+    'DiffusionGitWireProtocol' => 'Phobject',
+    'DiffusionGitWireProtocolCapabilities' => 'Phobject',
+    'DiffusionGitWireProtocolRef' => 'Phobject',
+    'DiffusionGitWireProtocolRefList' => 'Phobject',
     'DiffusionGraphController' => 'DiffusionController',
     'DiffusionHistoryController' => 'DiffusionController',
     'DiffusionHistoryListView' => 'DiffusionHistoryView',
@@ -6545,6 +6580,7 @@ phutil_register_library_map(array(
     'DiffusionPreCommitContentRevisionHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentRevisionReviewersHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentRevisionSubscribersHeraldField' => 'DiffusionPreCommitContentHeraldField',
+    'DiffusionPreCommitContentWrongBuildsHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitRefChangeHeraldField' => 'DiffusionPreCommitRefHeraldField',
     'DiffusionPreCommitRefHeraldField' => 'HeraldField',
     'DiffusionPreCommitRefHeraldFieldGroup' => 'HeraldFieldGroup',
@@ -6576,7 +6612,6 @@ phutil_register_library_map(array(
     'DiffusionRefTableController' => 'DiffusionController',
     'DiffusionRefsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
     'DiffusionRenameHistoryQuery' => 'Phobject',
-    'DiffusionRepositoryActionsManagementPanel' => 'DiffusionRepositoryManagementPanel',
     'DiffusionRepositoryAutomationManagementPanel' => 'DiffusionRepositoryManagementPanel',
     'DiffusionRepositoryBasicsManagementPanel' => 'DiffusionRepositoryManagementPanel',
     'DiffusionRepositoryBranchesManagementPanel' => 'DiffusionRepositoryManagementPanel',
@@ -6592,6 +6627,7 @@ phutil_register_library_map(array(
     'DiffusionRepositoryEditDeleteController' => 'DiffusionRepositoryManageController',
     'DiffusionRepositoryEditEngine' => 'PhabricatorEditEngine',
     'DiffusionRepositoryEditEnormousController' => 'DiffusionRepositoryManageController',
+    'DiffusionRepositoryEditPublishingController' => 'DiffusionRepositoryManageController',
     'DiffusionRepositoryEditUpdateController' => 'DiffusionRepositoryManageController',
     'DiffusionRepositoryFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'DiffusionRepositoryHistoryManagementPanel' => 'DiffusionRepositoryManagementPanel',
@@ -6659,6 +6695,7 @@ phutil_register_library_map(array(
     'DiffusionURIEditor' => 'PhabricatorApplicationTransactionEditor',
     'DiffusionURITestCase' => 'PhutilTestCase',
     'DiffusionUpdateCoverageConduitAPIMethod' => 'DiffusionConduitAPIMethod',
+    'DiffusionUpdateObjectAfterCommitWorker' => 'PhabricatorWorker',
     'DiffusionView' => 'AphrontView',
     'DivinerArticleAtomizer' => 'DivinerAtomizer',
     'DivinerAtom' => 'Phobject',
@@ -7341,6 +7378,7 @@ phutil_register_library_map(array(
     'HeraldTextFieldValue' => 'HeraldFieldValue',
     'HeraldTokenizerFieldValue' => 'HeraldFieldValue',
     'HeraldTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
+    'HeraldTransactionsFieldGroup' => 'HeraldFieldGroup',
     'HeraldTranscript' => array(
       'HeraldDAO',
       'PhabricatorPolicyInterface',
@@ -8323,6 +8361,7 @@ phutil_register_library_map(array(
     'PhabricatorAuthTryFactorAction' => 'PhabricatorSystemAction',
     'PhabricatorAuthUnlinkController' => 'PhabricatorAuthController',
     'PhabricatorAuthValidateController' => 'PhabricatorAuthController',
+    'PhabricatorAuthWaitForApprovalMessageType' => 'PhabricatorAuthMessageType',
     'PhabricatorAuthWelcomeMailMessageType' => 'PhabricatorAuthMessageType',
     'PhabricatorAuthenticationConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorAutoEventListener' => 'PhabricatorEventListener',
@@ -8607,6 +8646,11 @@ phutil_register_library_map(array(
     'PhabricatorChangeParserTestCase' => 'PhabricatorWorkingCopyTestCase',
     'PhabricatorChangesetCachePurger' => 'PhabricatorCachePurger',
     'PhabricatorChangesetResponse' => 'AphrontProxyResponse',
+    'PhabricatorChartAxis' => 'Phobject',
+    'PhabricatorChartDataQuery' => 'Phobject',
+    'PhabricatorChartFunction' => 'Phobject',
+    'PhabricatorChartFunctionArgument' => 'Phobject',
+    'PhabricatorChartFunctionArgumentParser' => 'Phobject',
     'PhabricatorChatLogApplication' => 'PhabricatorApplication',
     'PhabricatorChatLogChannel' => array(
       'PhabricatorChatLogDAO',
@@ -8773,6 +8817,7 @@ phutil_register_library_map(array(
     'PhabricatorConpherenceWidgetVisibleSetting' => 'PhabricatorInternalSetting',
     'PhabricatorConsoleApplication' => 'PhabricatorApplication',
     'PhabricatorConsoleContentSource' => 'PhabricatorContentSource',
+    'PhabricatorConstantChartFunction' => 'PhabricatorChartFunction',
     'PhabricatorContactNumbersSettingsPanel' => 'PhabricatorSettingsPanel',
     'PhabricatorContentSource' => 'Phobject',
     'PhabricatorContentSourceModule' => 'PhabricatorConfigModule',
@@ -8784,6 +8829,7 @@ phutil_register_library_map(array(
     'PhabricatorCoreCreateTransaction' => 'PhabricatorCoreTransactionType',
     'PhabricatorCoreTransactionType' => 'PhabricatorModularTransactionType',
     'PhabricatorCoreVoidTransaction' => 'PhabricatorModularTransactionType',
+    'PhabricatorCosChartFunction' => 'PhabricatorChartFunction',
     'PhabricatorCountFact' => 'PhabricatorFact',
     'PhabricatorCountdown' => array(
       'PhabricatorCountdownDAO',
@@ -9011,6 +9057,7 @@ phutil_register_library_map(array(
     'PhabricatorDashboardQueryPanelApplicationEditField' => 'PhabricatorEditField',
     'PhabricatorDashboardQueryPanelApplicationTransaction' => 'PhabricatorDashboardPanelPropertyTransaction',
     'PhabricatorDashboardQueryPanelInstallController' => 'PhabricatorDashboardController',
+    'PhabricatorDashboardQueryPanelLimitTransaction' => 'PhabricatorDashboardPanelPropertyTransaction',
     'PhabricatorDashboardQueryPanelQueryEditField' => 'PhabricatorEditField',
     'PhabricatorDashboardQueryPanelQueryTransaction' => 'PhabricatorDashboardPanelPropertyTransaction',
     'PhabricatorDashboardQueryPanelType' => 'PhabricatorDashboardPanelType',
@@ -9039,6 +9086,7 @@ phutil_register_library_map(array(
     'PhabricatorDatasourceEditType' => 'PhabricatorPHIDListEditType',
     'PhabricatorDatasourceEngine' => 'Phobject',
     'PhabricatorDatasourceEngineExtension' => 'Phobject',
+    'PhabricatorDatasourceURIEngineExtension' => 'PhabricatorDatasourceEngineExtension',
     'PhabricatorDateFormatSetting' => 'PhabricatorSelectSetting',
     'PhabricatorDateTimeSettingsPanel' => 'PhabricatorEditEngineSettingsPanel',
     'PhabricatorDebugController' => 'PhabricatorController',
@@ -9218,7 +9266,12 @@ phutil_register_library_map(array(
     'PhabricatorFact' => 'Phobject',
     'PhabricatorFactAggregate' => 'PhabricatorFactDAO',
     'PhabricatorFactApplication' => 'PhabricatorApplication',
+    'PhabricatorFactChart' => array(
+      'PhabricatorFactDAO',
+      'PhabricatorPolicyInterface',
+    ),
     'PhabricatorFactChartController' => 'PhabricatorFactController',
+    'PhabricatorFactChartFunction' => 'PhabricatorChartFunction',
     'PhabricatorFactController' => 'PhabricatorController',
     'PhabricatorFactCursor' => 'PhabricatorFactDAO',
     'PhabricatorFactDAO' => 'PhabricatorLiskDAO',
@@ -10491,6 +10544,7 @@ phutil_register_library_map(array(
     'PhabricatorProjectsSearchEngineExtension' => 'PhabricatorSearchEngineExtension',
     'PhabricatorProjectsWatchersSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
     'PhabricatorPronounSetting' => 'PhabricatorSelectSetting',
+    'PhabricatorProtocolLog' => 'Phobject',
     'PhabricatorPygmentSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorQuery' => 'Phobject',
     'PhabricatorQueryConstraint' => 'Phobject',
@@ -10502,7 +10556,6 @@ phutil_register_library_map(array(
       'Phobject',
       'Iterator',
     ),
-    'PhabricatorQuickSearchEngineExtension' => 'PhabricatorDatasourceEngineExtension',
     'PhabricatorRateLimitRequestExceptionHandler' => 'PhabricatorRequestExceptionHandler',
     'PhabricatorRebuildIndexesWorker' => 'PhabricatorWorker',
     'PhabricatorRecaptchaConfigOptions' => 'PhabricatorApplicationConfigOptions',
@@ -10541,8 +10594,6 @@ phutil_register_library_map(array(
       'PhabricatorRepositoryDAO',
       'PhabricatorPolicyInterface',
     ),
-    'PhabricatorRepositoryAutocloseOnlyTransaction' => 'PhabricatorRepositoryTransactionType',
-    'PhabricatorRepositoryAutocloseTransaction' => 'PhabricatorRepositoryTransactionType',
     'PhabricatorRepositoryBlueprintsTransaction' => 'PhabricatorRepositoryTransactionType',
     'PhabricatorRepositoryBranch' => 'PhabricatorRepositoryDAO',
     'PhabricatorRepositoryCallsignTransaction' => 'PhabricatorRepositoryTransactionType',
@@ -10567,15 +10618,14 @@ phutil_register_library_map(array(
     ),
     'PhabricatorRepositoryCommitChangeParserWorker' => 'PhabricatorRepositoryCommitParserWorker',
     'PhabricatorRepositoryCommitData' => 'PhabricatorRepositoryDAO',
-    'PhabricatorRepositoryCommitHeraldWorker' => 'PhabricatorRepositoryCommitParserWorker',
     'PhabricatorRepositoryCommitHint' => array(
       'PhabricatorRepositoryDAO',
       'PhabricatorPolicyInterface',
     ),
     'PhabricatorRepositoryCommitMessageParserWorker' => 'PhabricatorRepositoryCommitParserWorker',
-    'PhabricatorRepositoryCommitOwnersWorker' => 'PhabricatorRepositoryCommitParserWorker',
     'PhabricatorRepositoryCommitPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorRepositoryCommitParserWorker' => 'PhabricatorWorker',
+    'PhabricatorRepositoryCommitPublishWorker' => 'PhabricatorRepositoryCommitParserWorker',
     'PhabricatorRepositoryCommitRef' => 'Phobject',
     'PhabricatorRepositoryCommitTestCase' => 'PhabricatorTestCase',
     'PhabricatorRepositoryConfigOptions' => 'PhabricatorApplicationConfigOptions',
@@ -10591,6 +10641,7 @@ phutil_register_library_map(array(
     'PhabricatorRepositoryEngine' => 'Phobject',
     'PhabricatorRepositoryEnormousTransaction' => 'PhabricatorRepositoryTransactionType',
     'PhabricatorRepositoryFerretEngine' => 'PhabricatorFerretEngine',
+    'PhabricatorRepositoryFetchRefsTransaction' => 'PhabricatorRepositoryTransactionType',
     'PhabricatorRepositoryFilesizeLimitTransaction' => 'PhabricatorRepositoryTransactionType',
     'PhabricatorRepositoryFulltextEngine' => 'PhabricatorFulltextEngine',
     'PhabricatorRepositoryGitCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
@@ -10649,6 +10700,9 @@ phutil_register_library_map(array(
       'PhabricatorPolicyInterface',
     ),
     'PhabricatorRepositoryParsedChange' => 'Phobject',
+    'PhabricatorRepositoryPermanentRefsTransaction' => 'PhabricatorRepositoryTransactionType',
+    'PhabricatorRepositoryPublisher' => 'Phobject',
+    'PhabricatorRepositoryPublisherHoldReason' => 'Phobject',
     'PhabricatorRepositoryPullEngine' => 'PhabricatorRepositoryEngine',
     'PhabricatorRepositoryPullEvent' => array(
       'PhabricatorRepositoryDAO',
@@ -10742,6 +10796,7 @@ phutil_register_library_map(array(
       'PhabricatorPolicyInterface',
     ),
     'PhabricatorSavedQueryQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'PhabricatorScaleChartFunction' => 'PhabricatorChartFunction',
     'PhabricatorScheduleTaskTriggerAction' => 'PhabricatorTriggerAction',
     'PhabricatorScopedEnv' => 'Phobject',
     'PhabricatorSearchAbstractDocument' => 'Phobject',
@@ -10806,6 +10861,7 @@ phutil_register_library_map(array(
     'PhabricatorSecuritySetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorSelectEditField' => 'PhabricatorEditField',
     'PhabricatorSelectSetting' => 'PhabricatorSetting',
+    'PhabricatorSelfHyperlinkEngineExtension' => 'PhutilRemarkupHyperlinkEngineExtension',
     'PhabricatorSessionsSettingsPanel' => 'PhabricatorSettingsPanel',
     'PhabricatorSetConfigType' => 'PhabricatorTextConfigType',
     'PhabricatorSetting' => 'Phobject',
@@ -10831,9 +10887,11 @@ phutil_register_library_map(array(
     'PhabricatorSetupIssue' => 'Phobject',
     'PhabricatorSetupIssueUIExample' => 'PhabricatorUIExample',
     'PhabricatorSetupIssueView' => 'AphrontView',
+    'PhabricatorShiftChartFunction' => 'PhabricatorChartFunction',
     'PhabricatorShortSite' => 'PhabricatorSite',
     'PhabricatorShowFiletreeSetting' => 'PhabricatorSelectSetting',
     'PhabricatorSimpleEditType' => 'PhabricatorEditType',
+    'PhabricatorSinChartFunction' => 'PhabricatorChartFunction',
     'PhabricatorSite' => 'AphrontSite',
     'PhabricatorSlackAuthProvider' => 'PhabricatorOAuth2AuthProvider',
     'PhabricatorSlowvoteApplication' => 'PhabricatorApplication',
@@ -11265,6 +11323,7 @@ phutil_register_library_map(array(
     'PhabricatorWorkingCopyDiscoveryTestCase' => 'PhabricatorWorkingCopyTestCase',
     'PhabricatorWorkingCopyPullTestCase' => 'PhabricatorWorkingCopyTestCase',
     'PhabricatorWorkingCopyTestCase' => 'PhabricatorTestCase',
+    'PhabricatorXChartFunction' => 'PhabricatorChartFunction',
     'PhabricatorXHPASTDAO' => 'PhabricatorLiskDAO',
     'PhabricatorXHPASTParseTree' => 'PhabricatorXHPASTDAO',
     'PhabricatorXHPASTViewController' => 'PhabricatorController',
@@ -11646,7 +11705,6 @@ phutil_register_library_map(array(
     'PhortuneSubscriptionViewController' => 'PhortuneController',
     'PhortuneSubscriptionWorker' => 'PhabricatorWorker',
     'PhortuneTestPaymentProvider' => 'PhortunePaymentProvider',
-    'PhortuneWePayPaymentProvider' => 'PhortunePaymentProvider',
     'PhragmentBrowseController' => 'PhragmentController',
     'PhragmentCanCreateCapability' => 'PhabricatorPolicyCapability',
     'PhragmentConduitAPIMethod' => 'ConduitAPIMethod',
@@ -11766,6 +11824,7 @@ phutil_register_library_map(array(
     'PhrictionDocumentPathHeraldField' => 'PhrictionDocumentHeraldField',
     'PhrictionDocumentPolicyCodex' => 'PhabricatorPolicyCodex',
     'PhrictionDocumentPublishTransaction' => 'PhrictionDocumentTransactionType',
+    'PhrictionDocumentPublishedHeraldField' => 'PhrictionDocumentHeraldField',
     'PhrictionDocumentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhrictionDocumentSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'PhrictionDocumentSearchEngine' => 'PhabricatorApplicationSearchEngine',

src/aphront/AphrontRequest.php

@@ -383,6 +383,15 @@ final class AphrontRequest extends Phobject {
     return $this->validateCSRF();
   }
 
+  public function hasCSRF() {
+    try {
+      $this->validateCSRF();
+      return true;
+    } catch (AphrontMalformedRequestException $ex) {
+      return false;
+    }
+  }
+
   public function isFormOrHisecPost() {
     $post = $this->getExists(self::TYPE_FORM) &&
             $this->isHTTPPost();

src/applications/audit/editor/PhabricatorAuditEditor.php

@@ -184,7 +184,7 @@ final class PhabricatorAuditEditor
     foreach ($xactions as $xaction) {
       switch ($xaction->getTransactionType()) {
         case PhabricatorAuditTransaction::TYPE_COMMIT:
-          $import_status_flag = PhabricatorRepositoryCommit::IMPORTED_HERALD;
+          $import_status_flag = PhabricatorRepositoryCommit::IMPORTED_PUBLISH;
           break;
       }
     }
@@ -390,30 +390,13 @@ final class PhabricatorAuditEditor
       ->parseCorpus($huge_block);
     $reverts = array_mergev(ipull($reverts_refs, 'monograms'));
     if ($reverts) {
-      // Only allow commits to revert other commits in the same repository.
-      $reverted_commits = id(new DiffusionCommitQuery())
-        ->setViewer($actor)
-        ->withRepository($object->getRepository())
-        ->withIdentifiers($reverts)
-        ->execute();
+      $reverted_objects = DiffusionCommitRevisionQuery::loadRevertedObjects(
+        $actor,
+        $object,
+        $reverts,
+        $object->getRepository());
 
-      $reverted_revisions = id(new PhabricatorObjectQuery())
-        ->setViewer($actor)
-        ->withNames($reverts)
-        ->withTypes(
-          array(
-            DifferentialRevisionPHIDType::TYPECONST,
-          ))
-        ->execute();
-
-      $reverted_phids =
-        mpull($reverted_commits, 'getPHID', 'getPHID') +
-        mpull($reverted_revisions, 'getPHID', 'getPHID');
-
-      // NOTE: Skip any write attempts if a user cleverly implies a commit
-      // reverts itself, although this would be exceptionally clever in Git
-      // or Mercurial.
-      unset($reverted_phids[$object->getPHID()]);
+      $reverted_phids = mpull($reverted_objects, 'getPHID', 'getPHID');
 
       $reverts_edge = DiffusionCommitRevertsCommitEdgeType::EDGECONST;
       $result[] = id(new PhabricatorAuditTransaction())
@@ -718,7 +701,8 @@ final class PhabricatorAuditEditor
       switch ($xaction->getTransactionType()) {
         case PhabricatorAuditTransaction::TYPE_COMMIT:
           $repository = $object->getRepository();
-          if (!$repository->shouldPublish()) {
+          $publisher = $repository->newPublisher();
+          if (!$publisher->shouldPublishCommit($object)) {
             return false;
           }
           return true;
@@ -779,7 +763,8 @@ final class PhabricatorAuditEditor
     // TODO: They should, and then we should simplify this.
     $repository = $object->getRepository($assert_attached = false);
     if ($repository != PhabricatorLiskDAO::ATTACHABLE) {
-      if (!$repository->shouldPublish()) {
+      $publisher = $repository->newPublisher();
+      if (!$publisher->shouldPublishCommit($object)) {
         return false;
       }
     }

src/applications/audit/query/PhabricatorCommitSearchEngine.php

@@ -54,6 +54,10 @@ final class PhabricatorCommitSearchEngine
       $query->withUnreachable($map['unreachable']);
     }
 
+    if ($map['unpublished'] !== null) {
+      $query->withUnpublished($map['unpublished']);
+    }
+
     if ($map['ancestorsOf']) {
       $query->withAncestorsOf($map['ancestorsOf']);
     }
@@ -127,6 +131,17 @@ final class PhabricatorCommitSearchEngine
           pht(
             'Find or exclude unreachable commits which are not ancestors of '.
             'any branch, tag, or ref.')),
+      id(new PhabricatorSearchThreeStateField())
+        ->setLabel(pht('Unpublished'))
+        ->setKey('unpublished')
+        ->setOptions(
+          pht('(Show All)'),
+          pht('Show Only Unpublished Commits'),
+          pht('Hide Unpublished Commits'))
+        ->setDescription(
+          pht(
+            'Find or exclude unpublished commits which are not ancestors of '.
+            'any permanent branch, tag, or ref.')),
       id(new PhabricatorSearchStringListField())
         ->setLabel(pht('Ancestors Of'))
         ->setKey('ancestorsOf')

src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php

@@ -18,20 +18,51 @@ final class PhabricatorAuthNeedsApprovalController
   public function handleRequest(AphrontRequest $request) {
     $viewer = $this->getViewer();
 
+    $instructions = $this->newCustomWaitForApprovalInstructions();
+
     $wait_for_approval = pht(
       "Your account has been created, but needs to be approved by an ".
       "administrator. You'll receive an email once your account is approved.");
 
-    $dialog = id(new AphrontDialogView())
-      ->setUser($viewer)
+    $dialog = $this->newDialog()
       ->setTitle(pht('Wait for Approval'))
       ->appendChild($wait_for_approval)
       ->addCancelButton('/', pht('Wait Patiently'));
 
+    $crumbs = $this->buildApplicationCrumbs()
+      ->addTextCrumb(pht('Wait For Approval'))
+      ->setBorder(true);
+
     return $this->newPage()
       ->setTitle(pht('Wait For Approval'))
-      ->appendChild($dialog);
+      ->setCrumbs($crumbs)
+      ->appendChild(
+        array(
+          $instructions,
+          $dialog,
+        ));
 
   }
 
+  private function newCustomWaitForApprovalInstructions() {
+    $viewer = $this->getViewer();
+
+    $text = PhabricatorAuthMessage::loadMessageText(
+      $viewer,
+      PhabricatorAuthWaitForApprovalMessageType::MESSAGEKEY);
+
+    if (!strlen($text)) {
+      return null;
+    }
+
+    $remarkup_view = new PHUIRemarkupView($viewer, $text);
+
+    return phutil_tag(
+      'div',
+      array(
+        'class' => 'auth-custom-message',
+      ),
+      $remarkup_view);
+  }
+
 }

src/applications/auth/message/PhabricatorAuthWaitForApprovalMessageType.php

@@ -0,0 +1,19 @@
+<?php
+
+final class PhabricatorAuthWaitForApprovalMessageType
+  extends PhabricatorAuthMessageType {
+
+  const MESSAGEKEY = 'auth.wait-for-approval';
+
+  public function getDisplayName() {
+    return pht('Wait For Approval Instructions');
+  }
+
+  public function getShortDescription() {
+    return pht(
+      'Instructions on the "Wait For Approval" screen, shown to users who '.
+      'have registered an account that has not yet been approved by an '.
+      'administrator.');
+  }
+
+}

src/applications/auth/phid/PhabricatorAuthMessagePHIDType.php

@@ -28,7 +28,11 @@ final class PhabricatorAuthMessagePHIDType extends PhabricatorPHIDType {
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
-    return;
+
+    foreach ($handles as $phid => $handle) {
+      $message = $objects[$phid];
+      $handle->setURI($message->getURI());
+    }
   }
 
 }

src/applications/dashboard/controller/panel/PhabricatorDashboardPanelTabsController.php

@@ -140,7 +140,7 @@ final class PhabricatorDashboardPanelTabsController
       case 'remove':
         return $this->handleRemoveOperation($panel, $target, $cancel_uri);
       case 'move':
-        break;
+        return $this->handleMoveOperation($panel, $target, $after, $cancel_uri);
       case 'rename':
         return $this->handleRenameOperation($panel, $target, $cancel_uri);
     }
@@ -298,6 +298,89 @@ final class PhabricatorDashboardPanelTabsController
       ->addSubmitButton(pht('Rename Tab'));
   }
 
+  private function handleMoveOperation(
+    PhabricatorDashboardPanel $panel,
+    $target,
+    $after,
+    $cancel_uri) {
+    $request = $this->getRequest();
+    $viewer = $this->getViewer();
+
+    $move = $request->getStr('move');
+
+    $impl = $panel->getImplementation();
+    $old_config = $impl->getPanelConfiguration($panel);
+
+    $is_next = ($move === 'next');
+    if ($target === $after) {
+      return $this->newDialog()
+        ->setTitle(pht('Impossible!'))
+        ->appendParagraph(
+          pht(
+            'You can not move a tab relative to itself.'))
+        ->addCancelButton($cancel_uri);
+    } else if ($is_next && ((string)last_key($old_config) === $target)) {
+      return $this->newDialog()
+        ->setTitle(pht('Impossible!'))
+        ->appendParagraph(
+          pht(
+            'This is already the last tab. It can not move any farther to '.
+            'the right.'))
+        ->addCancelButton($cancel_uri);
+    } else if ((string)head_key($old_config) === $target) {
+      return $this->newDialog()
+        ->setTitle(pht('Impossible!'))
+        ->appendParagraph(
+          pht(
+            'This is already the first tab. It can not move any farther to '.
+            'the left.'))
+        ->addCancelButton($cancel_uri);
+    }
+
+    if ($request->hasCSRF()) {
+      $new_config = array();
+      foreach ($old_config as $old_key => $old_spec) {
+        $old_key = (string)$old_key;
+
+        $is_after = ($old_key === $after);
+
+        if (!$is_after) {
+          if ($old_key === $target) {
+            continue;
+          }
+        }
+
+        if ($is_after && !$is_next) {
+          $new_config[$target] = $old_config[$target];
+        }
+
+        $new_config[$old_key] = $old_spec;
+
+        if ($is_after && $is_next) {
+          $new_config[$target] = $old_config[$target];
+        }
+      }
+
+      $this->writePanelConfig($panel, $new_config);
+
+      return id(new AphrontRedirectResponse())->setURI($cancel_uri);
+    }
+
+    if ($is_next) {
+      $prompt = pht('Move this tab to the right?');
+    } else {
+      $prompt = pht('Move this tab to the left?');
+    }
+
+    return $this->newEditDialog()
+      ->setTitle(pht('Move Tab'))
+      ->addHiddenInput('target', $target)
+      ->addHiddenInput('after', $after)
+      ->addHiddenInput('move', $move)
+      ->appendParagraph($prompt)
+      ->addCancelButton($cancel_uri)
+      ->addSubmitButton(pht('Move Tab'));
+  }
 
   private function writePanelConfig(
     PhabricatorDashboardPanel $panel,

src/applications/dashboard/editor/PhabricatorDashboardPanelEditEngine.php

@@ -134,6 +134,12 @@ final class PhabricatorDashboardPanelEditEngine
     $context = $this->getContextObject();
 
     if ($context instanceof PhabricatorDashboard) {
+      // Only add the panel to the dashboard when we're creating a new panel,
+      // not if we're editing an existing panel.
+      if (!$this->getIsCreate()) {
+        return;
+      }
+
       $viewer = $this->getViewer();
       $controller = $this->getController();
       $request = $controller->getRequest();

src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php

@@ -329,6 +329,18 @@ final class PhabricatorDashboardPanelRenderingEngine extends Phobject {
     $actions = array();
 
     if ($panel) {
+      $panel_actions = $panel->newHeaderEditActions(
+        $viewer,
+        $context_phid);
+
+      if ($panel_actions) {
+        foreach ($panel_actions as $panel_action) {
+          $actions[] = $panel_action;
+        }
+        $actions[] = id(new PhabricatorActionView())
+          ->setType(PhabricatorActionView::TYPE_DIVIDER);
+      }
+
       $panel_id = $panel->getID();
 
       $edit_uri = "/dashboard/panel/edit/{$panel_id}/";

src/applications/dashboard/paneltype/PhabricatorDashboardPanelType.php

@@ -63,4 +63,11 @@ abstract class PhabricatorDashboardPanelType extends Phobject {
     return array();
   }
 
+  public function newHeaderEditActions(
+    PhabricatorDashboardPanel $panel,
+    PhabricatorUser $viewer,
+    $context_phid) {
+    return array();
+  }
+
 }

src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php

@@ -41,9 +41,17 @@ final class PhabricatorDashboardQueryPanelType
           PhabricatorDashboardQueryPanelQueryTransaction::TRANSACTIONTYPE)
         ->setValue($panel->getProperty('key', ''));
 
+    $limit_field = id(new PhabricatorIntEditField())
+      ->setKey('limit')
+      ->setLabel(pht('Limit'))
+      ->setTransactionType(
+        PhabricatorDashboardQueryPanelLimitTransaction::TRANSACTIONTYPE)
+      ->setValue($panel->getProperty('limit'));
+
     return array(
       $application_field,
       $query_field,
+      $limit_field,
     );
   }
 
@@ -228,4 +236,26 @@ final class PhabricatorDashboardQueryPanelType
     return $engine;
   }
 
+  public function newHeaderEditActions(
+    PhabricatorDashboardPanel $panel,
+    PhabricatorUser $viewer,
+    $context_phid) {
+    $actions = array();
+
+    $engine = $this->getSearchEngine($panel);
+
+    $customize_uri = $engine->getCustomizeURI(
+      $panel->getProperty('key'),
+      $panel->getPHID(),
+      $context_phid);
+
+    $actions[] = id(new PhabricatorActionView())
+      ->setIcon('fa-pencil-square-o')
+      ->setName(pht('Customize Query'))
+      ->setWorkflow(true)
+      ->setHref($customize_uri);
+
+    return $actions;
+  }
+
 }

src/applications/dashboard/paneltype/PhabricatorDashboardTabsPanelType.php

@@ -87,7 +87,15 @@ final class PhabricatorDashboardTabsPanelType
 
     $selected = 0;
 
-    $last_idx = null;
+    $key_list = array_keys($config);
+
+    $next_keys = array();
+    $prev_keys = array();
+    for ($ii = 0; $ii < count($key_list); $ii++) {
+      $next_keys[$key_list[$ii]] = idx($key_list, $ii + 1);
+      $prev_keys[$key_list[$ii]] = idx($key_list, $ii - 1);
+    }
+
     foreach ($config as $idx => $tab_spec) {
       $panel_id = idx($tab_spec, 'panelID');
       $subpanel = idx($panels, $panel_id);
@@ -145,6 +153,42 @@ final class PhabricatorDashboardTabsPanelType
             ->setHref($rename_tab_uri)
             ->setWorkflow(true));
 
+        $move_uri = urisprintf('/dashboard/panel/tabs/%d/move/', $id);
+
+        $prev_key = $prev_keys[$idx];
+        $prev_params = array(
+          'target' => $idx,
+          'after' => $prev_key,
+          'move' => 'prev',
+          'contextPHID' => $context_phid,
+        );
+        $prev_uri = new PhutilURI($move_uri, $prev_params);
+
+        $next_key = $next_keys[$idx];
+        $next_params = array(
+          'target' => $idx,
+          'after' => $next_key,
+          'move' => 'next',
+          'contextPHID' => $context_phid,
+        );
+        $next_uri = new PhutilURI($move_uri, $next_params);
+
+        $dropdown_menu->addAction(
+          id(new PhabricatorActionView())
+            ->setName(pht('Move Tab Left'))
+            ->setIcon('fa-chevron-left')
+            ->setHref($prev_uri)
+            ->setWorkflow(true)
+            ->setDisabled(($prev_key === null) || !$can_edit));
+
+        $dropdown_menu->addAction(
+          id(new PhabricatorActionView())
+            ->setName(pht('Move Tab Right'))
+            ->setIcon('fa-chevron-right')
+            ->setHref($next_uri)
+            ->setWorkflow(true)
+            ->setDisabled(($next_key === null) || !$can_edit));
+
         $dropdown_menu->addAction(
           id(new PhabricatorActionView())
             ->setName(pht('Remove Tab'))
@@ -177,15 +221,16 @@ final class PhabricatorDashboardTabsPanelType
       }
 
       $list->addMenuItem($tab_view);
-
-      $last_idx = $idx;
     }
 
+
     if ($is_edit) {
       $actions = id(new PhabricatorActionListView())
         ->setViewer($viewer);
 
       $add_last_uri = clone $add_uri;
+
+      $last_idx = last_key($config);
       if ($last_idx) {
         $add_last_uri->replaceQueryParam('after', $last_idx);
       }

src/applications/dashboard/storage/PhabricatorDashboardPanel.php

@@ -107,6 +107,15 @@ final class PhabricatorDashboardPanel
     return $this->requireImplementation()->getEditEngineFields($this);
   }
 
+  public function newHeaderEditActions(
+    PhabricatorUser $viewer,
+    $context_phid) {
+    return $this->requireImplementation()->newHeaderEditActions(
+      $this,
+      $viewer,
+      $context_phid);
+  }
+
 
 /* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
 

src/applications/dashboard/xaction/panel/PhabricatorDashboardQueryPanelLimitTransaction.php

@@ -0,0 +1,43 @@
+<?php
+
+final class PhabricatorDashboardQueryPanelLimitTransaction
+  extends PhabricatorDashboardPanelPropertyTransaction {
+
+  const TRANSACTIONTYPE = 'search.limit';
+
+  protected function getPropertyKey() {
+    return 'limit';
+  }
+
+  public function generateNewValue($object, $value) {
+    if (!$value) {
+      return null;
+    }
+
+    return $value;
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    $old_value = $object->getProperty($this->getPropertyKey());
+    foreach ($xactions as $xaction) {
+      $new_value = $xaction->getNewValue();
+
+      if ($new_value === $old_value) {
+        continue;
+      }
+
+      if ($new_value < 0) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'Query result limit must be empty, or at least 1.'),
+          $xaction);
+        continue;
+      }
+    }
+
+    return $errors;
+  }
+
+}

src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php

@@ -43,6 +43,7 @@ final class DifferentialGetRevisionConduitAPIMethod
       ->withIDs(array($revision_id))
       ->setViewer($request->getUser())
       ->needReviewers(true)
+      ->needCommitPHIDs(true)
       ->executeOne();
 
     if (!$revision) {
@@ -59,7 +60,7 @@ final class DifferentialGetRevisionConduitAPIMethod
     $diff_dicts = mpull($diffs, 'getDiffDict');
 
     $commit_dicts = array();
-    $commit_phids = $revision->loadCommitPHIDs();
+    $commit_phids = $revision->getCommitPHIDs();
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs($commit_phids)

src/applications/differential/controller/DifferentialChangesetViewController.php

@@ -110,10 +110,13 @@ final class DifferentialChangesetViewController extends DifferentialController {
 
     if ($left) {
       $left_data = $left->makeNewFile();
+      $left_properties = $left->getNewProperties();
       if ($right) {
         $right_data = $right->makeNewFile();
+        $right_properties = $right->getNewProperties();
       } else {
         $right_data = $left->makeOldFile();
+        $right_properties = $left->getOldProperties();
       }
 
       $engine = new PhabricatorDifferenceEngine();
@@ -124,6 +127,9 @@ final class DifferentialChangesetViewController extends DifferentialController {
       $choice = clone nonempty($left, $right);
       $choice->attachHunks($synthetic->getHunks());
 
+      $choice->setOldProperties($left_properties);
+      $choice->setNewProperties($right_properties);
+
       $changeset = $choice;
     }
 

src/applications/differential/controller/DifferentialRevisionViewController.php

@@ -51,6 +51,7 @@ final class DifferentialRevisionViewController
       ->setViewer($viewer)
       ->needReviewers(true)
       ->needReviewerAuthority(true)
+      ->needCommitPHIDs(true)
       ->executeOne();
     if (!$revision) {
       return new Aphront404Response();
@@ -146,7 +147,7 @@ final class DifferentialRevisionViewController
     $object_phids = array_merge(
       $revision->getReviewerPHIDs(),
       $subscriber_phids,
-      $revision->loadCommitPHIDs(),
+      $revision->getCommitPHIDs(),
       array(
         $revision->getAuthorPHID(),
         $viewer->getPHID(),

src/applications/differential/editor/DifferentialTransactionEditor.php

@@ -832,22 +832,14 @@ final class DifferentialTransactionEditor
     }
 
     if ($revert_monograms) {
-      $revert_objects = id(new PhabricatorObjectQuery())
-        ->setViewer($this->getActor())
-        ->withNames($revert_monograms)
-        ->withTypes(
-          array(
-            DifferentialRevisionPHIDType::TYPECONST,
-            PhabricatorRepositoryCommitPHIDType::TYPECONST,
-          ))
-        ->execute();
+      $revert_objects = DiffusionCommitRevisionQuery::loadRevertedObjects(
+        $this->getActor(),
+        $object,
+        $revert_monograms,
+        null);
 
       $revert_phids = mpull($revert_objects, 'getPHID', 'getPHID');
 
-      // Don't let an object revert itself, although other silly stuff like
-      // cycles of objects reverting each other is not prevented.
-      unset($revert_phids[$object->getPHID()]);
-
       $revert_type = DiffusionCommitRevertsCommitEdgeType::EDGECONST;
       $edges[$revert_type] = $revert_phids;
     } else {

src/applications/differential/engine/DifferentialDiffExtractionEngine.php

@@ -281,7 +281,11 @@ final class DifferentialDiffExtractionEngine extends Phobject {
         ->setNewValue($revision->getModernRevisionStatus());
     }
 
-    $concerning_builds = $this->loadConcerningBuilds($revision);
+    $concerning_builds = self::loadConcerningBuilds(
+      $this->getViewer(),
+      $revision,
+      $strict = false);
+
     if ($concerning_builds) {
       $build_list = array();
       foreach ($concerning_builds as $build) {
@@ -315,6 +319,7 @@ final class DifferentialDiffExtractionEngine extends Phobject {
     $editor = id(new DifferentialTransactionEditor())
       ->setActor($viewer)
       ->setContinueOnMissingFields(true)
+      ->setContinueOnNoEffect(true)
       ->setContentSource($content_source)
       ->setChangedPriorToCommitURI($changed_uri)
       ->setIsCloseByCommit(true);
@@ -324,18 +329,14 @@ final class DifferentialDiffExtractionEngine extends Phobject {
       $editor->setActingAsPHID($author_phid);
     }
 
-    try {
-      $editor->applyTransactions($revision, $xactions);
-    } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
-      // NOTE: We've marked transactions other than the CLOSE transaction
-      // as ignored when they don't have an effect, so this means that we
-      // lost a race to close the revision. That's perfectly fine, we can
-      // just continue normally.
-    }
+    $editor->applyTransactions($revision, $xactions);
   }
 
-  private function loadConcerningBuilds(DifferentialRevision $revision) {
-    $viewer = $this->getViewer();
+  public static function loadConcerningBuilds(
+    PhabricatorUser $viewer,
+    DifferentialRevision $revision,
+    $strict) {
+
     $diff = $revision->getActiveDiff();
 
     $buildables = id(new HarbormasterBuildableQuery())
@@ -348,7 +349,6 @@ final class DifferentialDiffExtractionEngine extends Phobject {
       return array();
     }
 
-
     $land_key = HarbormasterBuildPlanBehavior::BEHAVIOR_LANDWARNING;
     $behavior = HarbormasterBuildPlanBehavior::getBehavior($land_key);
 
@@ -397,7 +397,13 @@ final class DifferentialDiffExtractionEngine extends Phobject {
           // cases where the repository is observed and the fetch pipeline
           // stalls for a while.
 
-          continue;
+          // If we're in strict mode (from a pre-commit content hook), we do
+          // not ignore these, since we're doing an instantaneous check against
+          // the current state.
+
+          if (!$strict) {
+            continue;
+          }
         }
 
         if ($build->isPassed()) {

src/applications/differential/parser/DifferentialChangesetParser.php

@@ -1456,9 +1456,10 @@ final class DifferentialChangesetParser extends Phobject {
 
     $line = phutil_string_cast($line);
 
-    if (strpos($line, "\t") !== false) {
-      $line = $this->replaceTabsWithSpaces($line);
-    }
+    // TODO: This should be flexible, eventually.
+    $tab_width = 2;
+
+    $line = self::replaceTabsWithSpaces($line, $tab_width);
     $line = str_replace($search, $replace, $line);
 
     if ($is_html) {
@@ -1543,13 +1544,9 @@ final class DifferentialChangesetParser extends Phobject {
     return $rules;
   }
 
-  private function replaceTabsWithSpaces($line) {
-    // TODO: This should be flexible, eventually.
-    $tab_width = 2;
-
-    static $tags;
-    if ($tags === null) {
-      $tags = array();
+  public static function replaceTabsWithSpaces($line, $tab_width) {
+    static $tags = array();
+    if (empty($tags[$tab_width])) {
       for ($ii = 1; $ii <= $tab_width; $ii++) {
         $tag = phutil_tag(
           'span',
@@ -1562,42 +1559,120 @@ final class DifferentialChangesetParser extends Phobject {
       }
     }
 
-    // If the line is particularly long, don't try to vectorize it. Use a
-    // faster approximation of the correct tabstop expansion instead. This
-    // usually still arrives at the right result.
-    if (strlen($line) > 256) {
-      return str_replace("\t", $tags[$tab_width], $line);
+    // Expand all prefix tabs until we encounter any non-tab character. This
+    // is cheap and often immediately produces the correct result with no
+    // further work (and, particularly, no need to handle any unicode cases).
+
+    $len = strlen($line);
+
+    $head = 0;
+    for ($head = 0; $head < $len; $head++) {
+      $char = $line[$head];
+      if ($char !== "\t") {
+        break;
+      }
+    }
+
+    if ($head) {
+      if (empty($tags[$tab_width * $head])) {
+        $tags[$tab_width * $head] = str_repeat($tags[$tab_width], $head);
+      }
+      $prefix = $tags[$tab_width * $head];
+      $line = substr($line, $head);
+    } else {
+      $prefix = '';
+    }
+
+    // If we have no remaining tabs elsewhere in the string after taking care
+    // of all the prefix tabs, we're done.
+    if (strpos($line, "\t") === false) {
+      return $prefix.$line;
+    }
+
+    $len = strlen($line);
+
+    // If the line is particularly long, don't try to do anything special with
+    // it. Use a faster approximation of the correct tabstop expansion instead.
+    // This usually still arrives at the right result.
+    if ($len > 256) {
+      return $prefix.str_replace("\t", $tags[$tab_width], $line);
     }
 
-    $line = phutil_utf8v_combined($line);
     $in_tag = false;
     $pos = 0;
-    foreach ($line as $key => $char) {
-      if ($char === '<') {
-        $in_tag = true;
-        continue;
+
+    // See PHI1210. If the line only has single-byte characters, we don't need
+    // to vectorize it and can avoid an expensive UTF8 call.
+
+    $fast_path = preg_match('/^[\x01-\x7F]*\z/', $line);
+    if ($fast_path) {
+      $replace = array();
+      for ($ii = 0; $ii < $len; $ii++) {
+        $char = $line[$ii];
+        if ($char === '>') {
+          $in_tag = false;
+          continue;
+        }
+
+        if ($in_tag) {
+          continue;
+        }
+
+        if ($char === '<') {
+          $in_tag = true;
+          continue;
+        }
+
+        if ($char === "\t") {
+          $count = $tab_width - ($pos % $tab_width);
+          $pos += $count;
+          $replace[$ii] = $tags[$count];
+          continue;
+        }
+
+        $pos++;
       }
 
-      if ($char === '>') {
-        $in_tag = false;
-        continue;
+      if ($replace) {
+        // Apply replacements starting at the end of the string so they
+        // don't mess up the offsets for following replacements.
+        $replace = array_reverse($replace, true);
+
+        foreach ($replace as $replace_pos => $replacement) {
+          $line = substr_replace($line, $replacement, $replace_pos, 1);
+        }
+      }
+    } else {
+      $line = phutil_utf8v_combined($line);
+      foreach ($line as $key => $char) {
+        if ($char === '>') {
+          $in_tag = false;
+          continue;
+        }
+
+        if ($in_tag) {
+          continue;
+        }
+
+        if ($char === '<') {
+          $in_tag = true;
+          continue;
+        }
+
+        if ($char === "\t") {
+          $count = $tab_width - ($pos % $tab_width);
+          $pos += $count;
+          $line[$key] = $tags[$count];
+          continue;
+        }
+
+        $pos++;
       }
 
-      if ($in_tag) {
-        continue;
-      }
-
-      if ($char === "\t") {
-        $count = $tab_width - ($pos % $tab_width);
-        $pos += $count;
-        $line[$key] = $tags[$count];
-        continue;
-      }
-
-      $pos++;
+      $line = implode('', $line);
     }
 
-    return implode('', $line);
+    return $prefix.$line;
   }
 
 }

src/applications/differential/parser/DifferentialHunkParser.php

@@ -791,7 +791,7 @@ final class DifferentialHunkParser extends Phobject {
     // of the lines, and these copies truly weren't any different.
     //
     // When lines are aligned and marked identical, but they're not actually
-    // identcal, we now mark them as changed. The rest of the processing will
+    // identical, we now mark them as changed. The rest of the processing will
     // figure out how to render them appropritely.
 
     $new = $this->getNewLines();

src/applications/differential/parser/__tests__/DifferentialTabReplacementTestCase.php

@@ -0,0 +1,56 @@
+<?php
+
+final class DifferentialTabReplacementTestCase
+  extends PhabricatorTestCase {
+
+  public function testTabReplacement() {
+    $tab1 = "<span data-copy-text=\"\t\"> </span>";
+    $tab2 = "<span data-copy-text=\"\t\">  </span>";
+
+    $cat = "\xF0\x9F\x90\xB1";
+
+    $cases = array(
+      '' => '',
+      'x' => 'x',
+
+      // Tabs inside HTML tags should not be replaced.
+      "<\t>x" => "<\t>x",
+
+      // Normal tabs should be replaced. These are all aligned to the tab
+      // width, so they'll be replaced inline.
+      "\tx" => "{$tab2}x",
+      "  \tx" => "  {$tab2}x",
+      "\t x" => "{$tab2} x",
+      "aa\tx" => "aa{$tab2}x",
+      "aa  \tx" => "aa  {$tab2}x",
+      "aa\t x" => "aa{$tab2} x",
+
+      // This tab is not tabstop-aligned, so it is replaced with fewer
+      // spaces to bring us to the next tabstop.
+      " \tx" => " {$tab1}x",
+
+      // Text inside HTML tags should not count when aligning tabs with
+      // tabstops.
+      "<tag> </tag>\tx" => "<tag> </tag>{$tab1}x",
+      "<tag2> </tag>\tx" => "<tag2> </tag>{$tab1}x",
+
+      // The code has to take a slow path when inputs contain unicode, but
+      // should produce the right results and align tabs to tabstops while
+      // respecting UTF8 display character widths, not byte widths.
+      "{$cat}\tx" => "{$cat}{$tab1}x",
+      "{$cat}{$cat}\tx" => "{$cat}{$cat}{$tab2}x",
+    );
+
+    foreach ($cases as $input => $expect) {
+      $actual = DifferentialChangesetParser::replaceTabsWithSpaces(
+        $input,
+        2);
+
+      $this->assertEqual(
+        $expect,
+        $actual,
+        pht('Tabs to Spaces: %s', $input));
+    }
+  }
+
+}