Changeset 1162441

geoswitch/trunk/class.geoswitch.php

-                      r1051524
+                      r1162441
     private static $data_source = null;
     private static $useKm = true;
+    private static $found = '';
     public static function init() {
 …
         self::$initialized = true;
+        self::$user_ip = self::get_user_ip();
+        $opt = self::get_options();
+        self::$user_ip = empty($opt['debug_ip']) ? self::get_user_ip() : $opt['debug_ip'];
         try {
-            $opt = self::get_options();
             self::$useKm = ($opt['units'] == 'km');
             self::$data_source = self::request_record($opt);
-            self::$record = self::$data_source->city(self::$user_ip);
         } catch (Exception $e) {
+            self::$record = null;
+        }
+            self::$data_source = null;
+        }
+        self::$record = self::get_record();
         add_shortcode('geoswitch', array( 'GeoSwitch', 'switch_block' ));
         add_shortcode('geoswitch_case', array( 'GeoSwitch', 'switch_case' ));
         add_shortcode('geoswitch_ip', array( 'GeoSwitch', 'get_ip' ));
         add_shortcode('geoswitch_city', array( 'GeoSwitch', 'get_city' ));
 …
     public static function switch_block($atts, $content) {
         $str = do_shortcode($content);
         $arr = explode('#', $str, 3);
         return count($arr) == 3
             ? substr($arr[2], 0, intval($arr[1]))
             : '';
+        self::$found = null;
+        do_shortcode($content);
+        return is_null(self::$found)
+            ? ''
+            : self::$found;
+    }
     public static function switch_case($atts, $content) {
+        $expandedContent = do_shortcode($content);
+        if (!is_null(self::$found))
+            return;
+        $expandedContent = do_shortcode($content);
         if (is_null(self::$record)) {
             if (!empty($atts['city']) ||
 …
                 !empty($atts['within']) ||
                 !empty($atts['from'])) {
+                    return '';
+                    self::$found = '';
+            } else {
+                self::$found = $expandedContent;
+            }
+            return '#'.strlen($expandedContent).'#'.$expandedContent;
+        }
+            return '';
+        }
         if ((empty($atts['city']) || strcasecmp($atts['city'], self::$record->city->name) == 0)
 …
             &&
             (empty($atts['within']) || self::within($atts['within'], $atts['from']))) {
             return '#'.strlen($expandedContent).'#'.$expandedContent;
+            self::$found = $expandedContent;
+        }
         return '';
 …
         return self::$record->location->longitude;
+    }
     public static function activation() {
         $default_options=array(
             'database_name'=>'GeoLite2-City.mmdb',
-            'units'=>'km',
             'data_source'=>'localdb',
             'service_user_name'=>'',
+            'service_license_key'=>''
+            'service_license_key'=>'',
+            'units'=>'km',
+            'debug_ip'=>'',
          );
         add_option('geoswitch_options',$default_options);
 …
         if (!array_key_exists('database_name', $opt))
             $opt['database_name']='GeoLite2-City.mmdb';
-        if (!array_key_exists('units', $opt))
-            $opt['units']='km';
         if (!array_key_exists('data_source', $opt))
             $opt['data_source']='localdb';
 …
         if (!array_key_exists('service_license_key', $opt))
             $opt['service_license_key']='';
+        if (!array_key_exists('units', $opt))
+            $opt['units']='km';
+        if (!array_key_exists('debug_ip', $opt))
+            $opt['debug_ip']='';
         return $opt;
+    }
 …
+    }
+    private static function get_record() {
+        if (is_null(self::$data_source))
+            return null;
+        try {
+            return self::$data_source->city(self::$user_ip);
+        } catch  (Exception $e) {
+            error_log($e);
+            return null;
+        }
+    }
     private static function get_user_ip() {
         if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) ) {

geoswitch/trunk/class.geoswitch_admin.php

-                      r1051524
+                      r1162441
     public static function admin_init() {
         register_setting( 'geoswitch_options', 'geoswitch_options', array('GeoSwitchAdmin', 'validate') );
         add_settings_section('geoswitch_main', 'Geolocation Service Settings', array('GeoSwitchAdmin', 'data_source_section_text'), 'geoswitch_options_data_source_page');
+        add_settings_field('geoswitch_data_source', 'Select Geolocation Service', array('GeoSwitchAdmin', 'data_source'), 'geoswitch_options_data_source_page', 'geoswitch_main');
+        add_settings_section('geoswitch_main', 'Local DataBase Settings', array('GeoSwitchAdmin', 'localdb_section_text'), 'geoswitch_options_localdb_page');
+        add_settings_field('geoswitch_database_name', 'MaxMind Database Name', array('GeoSwitchAdmin', 'database_name'), 'geoswitch_options_localdb_page', 'geoswitch_main');
+        add_settings_section('geoswitch_main', 'Web Service Settings', array('GeoSwitchAdmin', 'webservice_section_text'), 'geoswitch_options_webservice_page');
+        add_settings_field('geoswitch_service_user_name', 'User ID', array('GeoSwitchAdmin', 'service_user_name'), 'geoswitch_options_webservice_page', 'geoswitch_main');
+        add_settings_field('geoswitch_data_source', 'Select Geolocation Service', array('GeoSwitchAdmin', 'data_source'), 'geoswitch_options_data_source_page', 'geoswitch_main');
+        add_settings_section('geoswitch_main', 'Local DataBase Settings', array('GeoSwitchAdmin', 'localdb_section_text'), 'geoswitch_options_localdb_page');
+        add_settings_field('geoswitch_database_name', 'MaxMind Database Name', array('GeoSwitchAdmin', 'database_name'), 'geoswitch_options_localdb_page', 'geoswitch_main');
+        add_settings_section('geoswitch_main', 'Web Service Settings', array('GeoSwitchAdmin', 'webservice_section_text'), 'geoswitch_options_webservice_page');
+        add_settings_field('geoswitch_service_user_name', 'User ID', array('GeoSwitchAdmin', 'service_user_name'), 'geoswitch_options_webservice_page', 'geoswitch_main');
         add_settings_field('geoswitch_service_license_key', 'License key', array('GeoSwitchAdmin', 'service_license_key'), 'geoswitch_options_webservice_page', 'geoswitch_main');
+        add_settings_section('geoswitch_main', 'Measurement Settings', array('GeoSwitchAdmin', 'measurement_section_text'), 'geoswitch_options_measurement_page');
+        add_settings_section('geoswitch_main', 'Measurement Settings', array('GeoSwitchAdmin', 'measurement_section_text'), 'geoswitch_options_measurement_page');
         add_settings_field('geoswitch_units', 'Distance Units', array('GeoSwitchAdmin', 'units'), 'geoswitch_options_measurement_page', 'geoswitch_main');
+        add_settings_section('geoswitch_main', 'Debug Settings', array('GeoSwitchAdmin', 'debug_section_text'), 'geoswitch_options_debug_page');
+        add_settings_field('geoswitch_debug_ip', 'User IP', array('GeoSwitchAdmin', 'debug_ip'), 'geoswitch_options_debug_page', 'geoswitch_main');
+    }
 …
     do_settings_sections('geoswitch_options_webservice_page');
     do_settings_sections('geoswitch_options_measurement_page');
+    do_settings_sections('geoswitch_options_debug_page');
 ?>
 <input name="Submit" type="submit" value="<?php esc_attr_e('Save Changes'); ?>" />
 …
+    }
+    public static function debug_section_text() {
+?>
+        These settings override the real settings for debugging purposes. Leave empty to disable.
+<?php
+    }
     public static function data_source() {
         $options =  GeoSwitch::get_options();
 …
 <?php
+    }
+    public static function debug_ip() {
+        $options =  GeoSwitch::get_options();
+?>
+<input id='geoswitch_debug_ip' name='geoswitch_options[debug_ip]' size='64' type='text' value='<?= $options['debug_ip']?>' />
+<?php
+    }
     public static function validate($input)
 …
             $newinput['database_name'] = 'GeoLite2-City.mmdb';
+        }
         if (isset($input['data_source'])) {
             $newinput['data_source'] = ($input['data_source'] == 'localdb' ? 'localdb' : 'webservice');
 …
             $newinput['service_user_name'] = trim($input['service_user_name']);
+        }
         if (isset($input['service_license_key'])){
             $newinput['service_license_key'] = trim($input['service_license_key']);
+        }
+         if (isset($input['debug_ip'])) {
+            $newinput['debug_ip'] = trim($input['debug_ip']);
+            if(!preg_match('/^[a-z0-9.:]+/i', $newinput['debug_ip'])) {
+                $newinput['debug_ip'] = '';
+            }
+        } else {
+            $newinput['debug_ip'] = '';
+        }
         return $newinput;
+    }

geoswitch/trunk/geoswitch.php

r1052444	r1162441
5	5	Tags: geocode, geocode switch, geocode filter, geotag, geomarketing, geomarking, geolocation, geofilter, location, local marketing, GeoIP2, MaxMind
6	6	Description: GeoSwitch is a plugin that allows you to change the content of your site based on the location of your client’s IP.
7		Version: 1.1.0
	7	Version: 1.1.1
8	8	Author: elialgranti
9	9	*/

geoswitch/trunk/readme.txt

-                      r1051886
+                      r1162441
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=C7QAD2M3L5T6E
 Tags: geocode, geocode switch, geocode filter, geotag, geomarketing, geomarking, geolocation, geofilter, location, local marketing, GeoIP2, MaxMind
 Version: 1.1.0
+Version: 1.1.1
 Requires at least: 3.0
 Tested up to: 4.1.0
 Stable tag: 1.1.0
+Tested up to: 4.2.1
+Stable tag: 1.1.1
 License: GPLv2 or later for plugin code, Apache License version 2.0 for Maxmind library under vendor directory
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
    The database should be uncompressed.
 . In the Wordpress administration settings search for the GeoSwitch configuration page:
 * Select the type of geocoding service to use (local database or webservice).
 * Enter the name of the database or the user ID and license key depending on the service you've selected.
 * Set the units to use for distance calculations (kilometer or miles).
+. Select the type of geocoding service to use (local database or webservice).
+. Enter the name of the database or the user ID and license key depending on the service you've selected.
+. Set the units to use for distance calculations (kilometer or miles).
 *Note: if you use the local database you should update it periodically.*
 …
+`
 [geoswitch]
 [geoswitch_case country_code=”AU” state_code=”NSW”]New South Wales Office[/geoswitch_case ]
 [geoswitch_case country_code=”AU”]Australian Office[/geoswitch_case ]
 [geoswitch_case]International Office[/geoswitch_case ]
+[geoswitch_case country_code="AU" state_code="NSW"]New South Wales Office[/geoswitch_case]
+[geoswitch_case country_code="AU"]Australian Office[/geoswitch_case]
+[geoswitch_case]International Office[/geoswitch_case]
 [/geoswitch]
+`
 …
+`
 [geoswitch]
 [geoswitch_case city=”paris”]You are in Paris![/geoswitch_case]
+[geoswitch_case city="paris"]You are in Paris![/geoswitch_case]
 [/geoswitch]
+`
 Will display “You are in Paris!” to any user with an IP location in a city named Paris, e.g Paris, France or Paris, Texas, USA.
+Will display "You are in Paris!" to any user with an IP location in a city named Paris, e.g Paris, France or Paris, Texas, USA.
 A `[geoswitch_case]` shortcode without any attributes always matches and can be used as the last condition in a conditional block
 to show default content.
 …
 = Informational Shortcodes =
+In addition to the conditional block GeoSwitch offers the following shortcodes to display user information:
-In addition to the conditional block GeoSwitch offers the following shortcodes to display user information:
 * `[geoswitch_ip]` - The user’s IP.
 * `[geoswitch_city]` - The user’s city name.
 …
 == Change Log ==
-= 1.0.0 =
-* Initial release
 = 1.1.0 =
 * Added support for MaxMind GeoIP2 Precision Service (thanks to [Paul Scarrone](https://github.com/ninjapanzer)
 …
 * Fixed bug with measurement units. Units were always considered kilometers.
 * Tested under Wordpress 4.1.
+= 1.0.0 =
+* Initial release
 == Upgrade Notice ==
+= 1.1.1 =
+Added setting to for user IP for debugging purposes and updated MaxMind Libraries.
 = 1.1.0 =
 Added support for MaxMind GeoIP2 Precision Service and fixed bug with measurement units.
 == Frequently Asked Questions ==
+=Why do I see only question marks instead of my location?=
+Your IP was not found in the database. The most usual cause if that your browser and server are behind a NAT and you are
+getting a private IP not a public one. For debugging purposes you can set the IP used by plug-in in the settings page.
+=My location is wrong/partial. How comes?=
+Geolocation using IP addresses is not entirely accurate. The geolocation relies on a static database of addresses and
+their approximate location, not exact location like mobile GPS.
+To ensure maximum accuracy make sure you have the latest database. Purchasing the non-lite version of the database from MaxMind
+or a license for their service may also yield better information.
+I am not affiliated in any way with MaxMind, so it is up to you to contact them and evaluate their offers for suitability to your purposes.
+=How do I test other locations?=
+You can set the IP used in by the pug-in in the settings page and use Google to search for IPs in the location you are interested
+in (i.e. IP in California).
+Debug overrides for other setting are coming.
 == Screenshots ==

geoswitch/trunk/vendor/autoload.php

r1041126	r1162441
5	5	require_once __DIR__ . '/composer' . '/autoload_real.php';
6	6
7		return ComposerAutoloaderInit~~8464b2127941ab48c5f1bc415f6fd7cf~~::getLoader();
	7	return ComposerAutoloaderInitc972343569c2a65fec3e90a966f2be39::getLoader();

geoswitch/trunk/vendor/composer/ClassLoader.php

-                      r1041126
+                      r1162441
     private $classMap = array();
+    private $classMapAuthoritative = false;
     public function getPrefixes()
+    {
+        return call_user_func_array('array_merge', $this->prefixesPsr0);
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
+        }
+        return array();
+    }
 …
     /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+    /**
      * Registers this instance as an autoloader.
+     *
 …
         if (isset($this->classMap[$class])) {
             return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative) {
+            return false;
+        }
 …
                 if (0 === strpos($class, $prefix)) {
                     foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
                         if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;
+                        }
 …
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
             if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
                 return $file;
+            }
 …
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
                         if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                             return $file;
+                        }
 …
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
             if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                 return $file;
+            }

geoswitch/trunk/vendor/composer/autoload_classmap.php

-                      r1041126
+                      r1162441
 return array(
+    'GeoIp2\\Database\\Reader' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Database/Reader.php',
+    'GeoIp2\\Exception\\AddressNotFoundException' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Exception/AddressNotFoundException.php',
+    'GeoIp2\\Exception\\AuthenticationException' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Exception/AuthenticationException.php',
+    'GeoIp2\\Exception\\GeoIp2Exception' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Exception/GeoIp2Exception.php',
+    'GeoIp2\\Exception\\HttpException' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Exception/HttpException.php',
+    'GeoIp2\\Exception\\InvalidRequestException' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Exception/InvalidRequestException.php',
+    'GeoIp2\\Exception\\OutOfQueriesException' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Exception/OutOfQueriesException.php',
+    'GeoIp2\\Model\\AbstractModel' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Model/AbstractModel.php',
+    'GeoIp2\\Model\\AnonymousIp' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Model/AnonymousIp.php',
+    'GeoIp2\\Model\\City' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Model/City.php',
+    'GeoIp2\\Model\\ConnectionType' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Model/ConnectionType.php',
+    'GeoIp2\\Model\\Country' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Model/Country.php',
+    'GeoIp2\\Model\\Domain' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Model/Domain.php',
+    'GeoIp2\\Model\\Insights' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Model/Insights.php',
+    'GeoIp2\\Model\\Isp' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Model/Isp.php',
+    'GeoIp2\\ProviderInterface' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/ProviderInterface.php',
+    'GeoIp2\\Record\\AbstractPlaceRecord' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Record/AbstractPlaceRecord.php',
+    'GeoIp2\\Record\\AbstractRecord' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Record/AbstractRecord.php',
+    'GeoIp2\\Record\\City' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Record/City.php',
+    'GeoIp2\\Record\\Continent' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Record/Continent.php',
+    'GeoIp2\\Record\\Country' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Record/Country.php',
+    'GeoIp2\\Record\\Location' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Record/Location.php',
+    'GeoIp2\\Record\\MaxMind' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Record/MaxMind.php',
+    'GeoIp2\\Record\\Postal' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Record/Postal.php',
+    'GeoIp2\\Record\\RepresentedCountry' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Record/RepresentedCountry.php',
+    'GeoIp2\\Record\\Subdivision' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Record/Subdivision.php',
+    'GeoIp2\\Record\\Traits' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/Record/Traits.php',
+    'GeoIp2\\WebService\\Client' => $vendorDir . '/geoip2/geoip2/src/GeoIp2/WebService/Client.php',
+    'Guzzle\\Batch\\AbstractBatchDecorator' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/AbstractBatchDecorator.php',
+    'Guzzle\\Batch\\Batch' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/Batch.php',
+    'Guzzle\\Batch\\BatchBuilder' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/BatchBuilder.php',
+    'Guzzle\\Batch\\BatchClosureDivisor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/BatchClosureDivisor.php',
+    'Guzzle\\Batch\\BatchClosureTransfer' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/BatchClosureTransfer.php',
+    'Guzzle\\Batch\\BatchCommandTransfer' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/BatchCommandTransfer.php',
+    'Guzzle\\Batch\\BatchDivisorInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/BatchDivisorInterface.php',
+    'Guzzle\\Batch\\BatchInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/BatchInterface.php',
+    'Guzzle\\Batch\\BatchRequestTransfer' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/BatchRequestTransfer.php',
+    'Guzzle\\Batch\\BatchSizeDivisor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/BatchSizeDivisor.php',
+    'Guzzle\\Batch\\BatchTransferInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/BatchTransferInterface.php',
+    'Guzzle\\Batch\\ExceptionBufferingBatch' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/ExceptionBufferingBatch.php',
+    'Guzzle\\Batch\\Exception\\BatchTransferException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/Exception/BatchTransferException.php',
+    'Guzzle\\Batch\\FlushingBatch' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/FlushingBatch.php',
+    'Guzzle\\Batch\\HistoryBatch' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/HistoryBatch.php',
+    'Guzzle\\Batch\\NotifyingBatch' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Batch/NotifyingBatch.php',
+    'Guzzle\\Cache\\AbstractCacheAdapter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Cache/AbstractCacheAdapter.php',
+    'Guzzle\\Cache\\CacheAdapterFactory' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Cache/CacheAdapterFactory.php',
+    'Guzzle\\Cache\\CacheAdapterInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Cache/CacheAdapterInterface.php',
+    'Guzzle\\Cache\\ClosureCacheAdapter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Cache/ClosureCacheAdapter.php',
+    'Guzzle\\Cache\\DoctrineCacheAdapter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Cache/DoctrineCacheAdapter.php',
+    'Guzzle\\Cache\\NullCacheAdapter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Cache/NullCacheAdapter.php',
+    'Guzzle\\Cache\\Zf1CacheAdapter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Cache/Zf1CacheAdapter.php',
+    'Guzzle\\Cache\\Zf2CacheAdapter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Cache/Zf2CacheAdapter.php',
+    'Guzzle\\Common\\AbstractHasDispatcher' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Common/AbstractHasDispatcher.php',
+    'Guzzle\\Common\\Collection' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Common/Collection.php',
+    'Guzzle\\Common\\Event' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Common/Event.php',
+    'Guzzle\\Common\\Exception\\BadMethodCallException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Common/Exception/BadMethodCallException.php',
+    'Guzzle\\Common\\Exception\\ExceptionCollection' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Common/Exception/ExceptionCollection.php',
+    'Guzzle\\Common\\Exception\\GuzzleException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Common/Exception/GuzzleException.php',
+    'Guzzle\\Common\\Exception\\InvalidArgumentException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Common/Exception/InvalidArgumentException.php',
+    'Guzzle\\Common\\Exception\\RuntimeException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Common/Exception/RuntimeException.php',
+    'Guzzle\\Common\\Exception\\UnexpectedValueException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Common/Exception/UnexpectedValueException.php',
+    'Guzzle\\Common\\FromConfigInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Common/FromConfigInterface.php',
+    'Guzzle\\Common\\HasDispatcherInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Common/HasDispatcherInterface.php',
+    'Guzzle\\Common\\ToArrayInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Common/ToArrayInterface.php',
+    'Guzzle\\Common\\Version' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Common/Version.php',
+    'Guzzle\\Http\\AbstractEntityBodyDecorator' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/AbstractEntityBodyDecorator.php',
+    'Guzzle\\Http\\CachingEntityBody' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/CachingEntityBody.php',
+    'Guzzle\\Http\\Client' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Client.php',
+    'Guzzle\\Http\\ClientInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/ClientInterface.php',
+    'Guzzle\\Http\\Curl\\CurlHandle' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Curl/CurlHandle.php',
+    'Guzzle\\Http\\Curl\\CurlMulti' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Curl/CurlMulti.php',
+    'Guzzle\\Http\\Curl\\CurlMultiInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Curl/CurlMultiInterface.php',
+    'Guzzle\\Http\\Curl\\CurlMultiProxy' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Curl/CurlMultiProxy.php',
+    'Guzzle\\Http\\Curl\\CurlVersion' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Curl/CurlVersion.php',
+    'Guzzle\\Http\\Curl\\RequestMediator' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Curl/RequestMediator.php',
+    'Guzzle\\Http\\EntityBody' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/EntityBody.php',
+    'Guzzle\\Http\\EntityBodyInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/EntityBodyInterface.php',
+    'Guzzle\\Http\\Exception\\BadResponseException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Exception/BadResponseException.php',
+    'Guzzle\\Http\\Exception\\ClientErrorResponseException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Exception/ClientErrorResponseException.php',
+    'Guzzle\\Http\\Exception\\CouldNotRewindStreamException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Exception/CouldNotRewindStreamException.php',
+    'Guzzle\\Http\\Exception\\CurlException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Exception/CurlException.php',
+    'Guzzle\\Http\\Exception\\HttpException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Exception/HttpException.php',
+    'Guzzle\\Http\\Exception\\MultiTransferException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Exception/MultiTransferException.php',
+    'Guzzle\\Http\\Exception\\RequestException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Exception/RequestException.php',
+    'Guzzle\\Http\\Exception\\ServerErrorResponseException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Exception/ServerErrorResponseException.php',
+    'Guzzle\\Http\\Exception\\TooManyRedirectsException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Exception/TooManyRedirectsException.php',
+    'Guzzle\\Http\\IoEmittingEntityBody' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/IoEmittingEntityBody.php',
+    'Guzzle\\Http\\Message\\AbstractMessage' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/AbstractMessage.php',
+    'Guzzle\\Http\\Message\\EntityEnclosingRequest' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/EntityEnclosingRequest.php',
+    'Guzzle\\Http\\Message\\EntityEnclosingRequestInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/EntityEnclosingRequestInterface.php',
+    'Guzzle\\Http\\Message\\Header' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/Header.php',
+    'Guzzle\\Http\\Message\\Header\\CacheControl' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/Header/CacheControl.php',
+    'Guzzle\\Http\\Message\\Header\\HeaderCollection' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/Header/HeaderCollection.php',
+    'Guzzle\\Http\\Message\\Header\\HeaderFactory' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/Header/HeaderFactory.php',
+    'Guzzle\\Http\\Message\\Header\\HeaderFactoryInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/Header/HeaderFactoryInterface.php',
+    'Guzzle\\Http\\Message\\Header\\HeaderInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/Header/HeaderInterface.php',
+    'Guzzle\\Http\\Message\\Header\\Link' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/Header/Link.php',
+    'Guzzle\\Http\\Message\\MessageInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/MessageInterface.php',
+    'Guzzle\\Http\\Message\\PostFile' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/PostFile.php',
+    'Guzzle\\Http\\Message\\PostFileInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/PostFileInterface.php',
+    'Guzzle\\Http\\Message\\Request' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/Request.php',
+    'Guzzle\\Http\\Message\\RequestFactory' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/RequestFactory.php',
+    'Guzzle\\Http\\Message\\RequestFactoryInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/RequestFactoryInterface.php',
+    'Guzzle\\Http\\Message\\RequestInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/RequestInterface.php',
+    'Guzzle\\Http\\Message\\Response' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Message/Response.php',
+    'Guzzle\\Http\\Mimetypes' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Mimetypes.php',
+    'Guzzle\\Http\\QueryAggregator\\CommaAggregator' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/QueryAggregator/CommaAggregator.php',
+    'Guzzle\\Http\\QueryAggregator\\DuplicateAggregator' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/QueryAggregator/DuplicateAggregator.php',
+    'Guzzle\\Http\\QueryAggregator\\PhpAggregator' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/QueryAggregator/PhpAggregator.php',
+    'Guzzle\\Http\\QueryAggregator\\QueryAggregatorInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/QueryAggregator/QueryAggregatorInterface.php',
+    'Guzzle\\Http\\QueryString' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/QueryString.php',
+    'Guzzle\\Http\\ReadLimitEntityBody' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/ReadLimitEntityBody.php',
+    'Guzzle\\Http\\RedirectPlugin' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/RedirectPlugin.php',
+    'Guzzle\\Http\\StaticClient' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/StaticClient.php',
+    'Guzzle\\Http\\Url' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Http/Url.php',
+    'Guzzle\\Inflection\\Inflector' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Inflection/Inflector.php',
+    'Guzzle\\Inflection\\InflectorInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Inflection/InflectorInterface.php',
+    'Guzzle\\Inflection\\MemoizingInflector' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Inflection/MemoizingInflector.php',
+    'Guzzle\\Inflection\\PreComputedInflector' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Inflection/PreComputedInflector.php',
+    'Guzzle\\Iterator\\AppendIterator' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Iterator/AppendIterator.php',
+    'Guzzle\\Iterator\\ChunkedIterator' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Iterator/ChunkedIterator.php',
+    'Guzzle\\Iterator\\FilterIterator' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Iterator/FilterIterator.php',
+    'Guzzle\\Iterator\\MapIterator' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Iterator/MapIterator.php',
+    'Guzzle\\Iterator\\MethodProxyIterator' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Iterator/MethodProxyIterator.php',
+    'Guzzle\\Log\\AbstractLogAdapter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Log/AbstractLogAdapter.php',
+    'Guzzle\\Log\\ArrayLogAdapter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Log/ArrayLogAdapter.php',
+    'Guzzle\\Log\\ClosureLogAdapter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Log/ClosureLogAdapter.php',
+    'Guzzle\\Log\\LogAdapterInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Log/LogAdapterInterface.php',
+    'Guzzle\\Log\\MessageFormatter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Log/MessageFormatter.php',
+    'Guzzle\\Log\\MonologLogAdapter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Log/MonologLogAdapter.php',
+    'Guzzle\\Log\\PsrLogAdapter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Log/PsrLogAdapter.php',
+    'Guzzle\\Log\\Zf1LogAdapter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Log/Zf1LogAdapter.php',
+    'Guzzle\\Log\\Zf2LogAdapter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Log/Zf2LogAdapter.php',
+    'Guzzle\\Parser\\Cookie\\CookieParser' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Parser/Cookie/CookieParser.php',
+    'Guzzle\\Parser\\Cookie\\CookieParserInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Parser/Cookie/CookieParserInterface.php',
+    'Guzzle\\Parser\\Message\\AbstractMessageParser' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Parser/Message/AbstractMessageParser.php',
+    'Guzzle\\Parser\\Message\\MessageParser' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Parser/Message/MessageParser.php',
+    'Guzzle\\Parser\\Message\\MessageParserInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Parser/Message/MessageParserInterface.php',
+    'Guzzle\\Parser\\Message\\PeclHttpMessageParser' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Parser/Message/PeclHttpMessageParser.php',
+    'Guzzle\\Parser\\ParserRegistry' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Parser/ParserRegistry.php',
+    'Guzzle\\Parser\\UriTemplate\\PeclUriTemplate' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Parser/UriTemplate/PeclUriTemplate.php',
+    'Guzzle\\Parser\\UriTemplate\\UriTemplate' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Parser/UriTemplate/UriTemplate.php',
+    'Guzzle\\Parser\\UriTemplate\\UriTemplateInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Parser/UriTemplate/UriTemplateInterface.php',
+    'Guzzle\\Parser\\Url\\UrlParser' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Parser/Url/UrlParser.php',
+    'Guzzle\\Parser\\Url\\UrlParserInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Parser/Url/UrlParserInterface.php',
+    'Guzzle\\Plugin\\Async\\AsyncPlugin' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Async/AsyncPlugin.php',
+    'Guzzle\\Plugin\\Backoff\\AbstractBackoffStrategy' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Backoff/AbstractBackoffStrategy.php',
+    'Guzzle\\Plugin\\Backoff\\AbstractErrorCodeBackoffStrategy' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Backoff/AbstractErrorCodeBackoffStrategy.php',
+    'Guzzle\\Plugin\\Backoff\\BackoffLogger' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Backoff/BackoffLogger.php',
+    'Guzzle\\Plugin\\Backoff\\BackoffPlugin' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Backoff/BackoffPlugin.php',
+    'Guzzle\\Plugin\\Backoff\\BackoffStrategyInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Backoff/BackoffStrategyInterface.php',
+    'Guzzle\\Plugin\\Backoff\\CallbackBackoffStrategy' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Backoff/CallbackBackoffStrategy.php',
+    'Guzzle\\Plugin\\Backoff\\ConstantBackoffStrategy' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Backoff/ConstantBackoffStrategy.php',
+    'Guzzle\\Plugin\\Backoff\\CurlBackoffStrategy' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Backoff/CurlBackoffStrategy.php',
+    'Guzzle\\Plugin\\Backoff\\ExponentialBackoffStrategy' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Backoff/ExponentialBackoffStrategy.php',
+    'Guzzle\\Plugin\\Backoff\\HttpBackoffStrategy' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Backoff/HttpBackoffStrategy.php',
+    'Guzzle\\Plugin\\Backoff\\LinearBackoffStrategy' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Backoff/LinearBackoffStrategy.php',
+    'Guzzle\\Plugin\\Backoff\\ReasonPhraseBackoffStrategy' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Backoff/ReasonPhraseBackoffStrategy.php',
+    'Guzzle\\Plugin\\Backoff\\TruncatedBackoffStrategy' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Backoff/TruncatedBackoffStrategy.php',
+    'Guzzle\\Plugin\\Cache\\CacheKeyProviderInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cache/CacheKeyProviderInterface.php',
+    'Guzzle\\Plugin\\Cache\\CachePlugin' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cache/CachePlugin.php',
+    'Guzzle\\Plugin\\Cache\\CacheStorageInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cache/CacheStorageInterface.php',
+    'Guzzle\\Plugin\\Cache\\CallbackCanCacheStrategy' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cache/CallbackCanCacheStrategy.php',
+    'Guzzle\\Plugin\\Cache\\CanCacheStrategyInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cache/CanCacheStrategyInterface.php',
+    'Guzzle\\Plugin\\Cache\\DefaultCacheKeyProvider' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cache/DefaultCacheKeyProvider.php',
+    'Guzzle\\Plugin\\Cache\\DefaultCacheStorage' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cache/DefaultCacheStorage.php',
+    'Guzzle\\Plugin\\Cache\\DefaultCanCacheStrategy' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cache/DefaultCanCacheStrategy.php',
+    'Guzzle\\Plugin\\Cache\\DefaultRevalidation' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cache/DefaultRevalidation.php',
+    'Guzzle\\Plugin\\Cache\\DenyRevalidation' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cache/DenyRevalidation.php',
+    'Guzzle\\Plugin\\Cache\\RevalidationInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cache/RevalidationInterface.php',
+    'Guzzle\\Plugin\\Cache\\SkipRevalidation' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cache/SkipRevalidation.php',
+    'Guzzle\\Plugin\\Cookie\\Cookie' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cookie/Cookie.php',
+    'Guzzle\\Plugin\\Cookie\\CookieJar\\ArrayCookieJar' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cookie/CookieJar/ArrayCookieJar.php',
+    'Guzzle\\Plugin\\Cookie\\CookieJar\\CookieJarInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cookie/CookieJar/CookieJarInterface.php',
+    'Guzzle\\Plugin\\Cookie\\CookieJar\\FileCookieJar' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cookie/CookieJar/FileCookieJar.php',
+    'Guzzle\\Plugin\\Cookie\\CookiePlugin' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cookie/CookiePlugin.php',
+    'Guzzle\\Plugin\\Cookie\\Exception\\InvalidCookieException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Cookie/Exception/InvalidCookieException.php',
+    'Guzzle\\Plugin\\CurlAuth\\CurlAuthPlugin' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/CurlAuth/CurlAuthPlugin.php',
+    'Guzzle\\Plugin\\ErrorResponse\\ErrorResponseExceptionInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/ErrorResponse/ErrorResponseExceptionInterface.php',
+    'Guzzle\\Plugin\\ErrorResponse\\ErrorResponsePlugin' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/ErrorResponse/ErrorResponsePlugin.php',
+    'Guzzle\\Plugin\\ErrorResponse\\Exception\\ErrorResponseException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/ErrorResponse/Exception/ErrorResponseException.php',
+    'Guzzle\\Plugin\\History\\HistoryPlugin' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/History/HistoryPlugin.php',
+    'Guzzle\\Plugin\\Log\\LogPlugin' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Log/LogPlugin.php',
+    'Guzzle\\Plugin\\Md5\\CommandContentMd5Plugin' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Md5/CommandContentMd5Plugin.php',
+    'Guzzle\\Plugin\\Md5\\Md5ValidatorPlugin' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Md5/Md5ValidatorPlugin.php',
+    'Guzzle\\Plugin\\Mock\\MockPlugin' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Mock/MockPlugin.php',
+    'Guzzle\\Plugin\\Oauth\\OauthPlugin' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Plugin/Oauth/OauthPlugin.php',
+    'Guzzle\\Service\\AbstractConfigLoader' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/AbstractConfigLoader.php',
+    'Guzzle\\Service\\Builder\\ServiceBuilder' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Builder/ServiceBuilder.php',
+    'Guzzle\\Service\\Builder\\ServiceBuilderInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Builder/ServiceBuilderInterface.php',
+    'Guzzle\\Service\\Builder\\ServiceBuilderLoader' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Builder/ServiceBuilderLoader.php',
+    'Guzzle\\Service\\CachingConfigLoader' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/CachingConfigLoader.php',
+    'Guzzle\\Service\\Client' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Client.php',
+    'Guzzle\\Service\\ClientInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/ClientInterface.php',
+    'Guzzle\\Service\\Command\\AbstractCommand' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/AbstractCommand.php',
+    'Guzzle\\Service\\Command\\ClosureCommand' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/ClosureCommand.php',
+    'Guzzle\\Service\\Command\\CommandInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/CommandInterface.php',
+    'Guzzle\\Service\\Command\\CreateResponseClassEvent' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/CreateResponseClassEvent.php',
+    'Guzzle\\Service\\Command\\DefaultRequestSerializer' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/DefaultRequestSerializer.php',
+    'Guzzle\\Service\\Command\\DefaultResponseParser' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/DefaultResponseParser.php',
+    'Guzzle\\Service\\Command\\Factory\\AliasFactory' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/Factory/AliasFactory.php',
+    'Guzzle\\Service\\Command\\Factory\\CompositeFactory' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/Factory/CompositeFactory.php',
+    'Guzzle\\Service\\Command\\Factory\\ConcreteClassFactory' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/Factory/ConcreteClassFactory.php',
+    'Guzzle\\Service\\Command\\Factory\\FactoryInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/Factory/FactoryInterface.php',
+    'Guzzle\\Service\\Command\\Factory\\MapFactory' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/Factory/MapFactory.php',
+    'Guzzle\\Service\\Command\\Factory\\ServiceDescriptionFactory' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/Factory/ServiceDescriptionFactory.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Request\\AbstractRequestVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Request/AbstractRequestVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Request\\BodyVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Request/BodyVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Request\\HeaderVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Request/HeaderVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Request\\JsonVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Request/JsonVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Request\\PostFieldVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Request/PostFieldVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Request\\PostFileVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Request/PostFileVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Request\\QueryVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Request/QueryVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Request\\RequestVisitorInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Request/RequestVisitorInterface.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Request\\ResponseBodyVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Request/ResponseBodyVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Request\\XmlVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Request/XmlVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Response\\AbstractResponseVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Response/AbstractResponseVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Response\\BodyVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Response/BodyVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Response\\HeaderVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Response/HeaderVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Response\\JsonVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Response/JsonVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Response\\ReasonPhraseVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Response/ReasonPhraseVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Response\\ResponseVisitorInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Response/ResponseVisitorInterface.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Response\\StatusCodeVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Response/StatusCodeVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\Response\\XmlVisitor' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Response/XmlVisitor.php',
+    'Guzzle\\Service\\Command\\LocationVisitor\\VisitorFlyweight' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/VisitorFlyweight.php',
+    'Guzzle\\Service\\Command\\OperationCommand' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/OperationCommand.php',
+    'Guzzle\\Service\\Command\\OperationResponseParser' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/OperationResponseParser.php',
+    'Guzzle\\Service\\Command\\RequestSerializerInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/RequestSerializerInterface.php',
+    'Guzzle\\Service\\Command\\ResponseClassInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/ResponseClassInterface.php',
+    'Guzzle\\Service\\Command\\ResponseParserInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Command/ResponseParserInterface.php',
+    'Guzzle\\Service\\ConfigLoaderInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/ConfigLoaderInterface.php',
+    'Guzzle\\Service\\Description\\Operation' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Description/Operation.php',
+    'Guzzle\\Service\\Description\\OperationInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Description/OperationInterface.php',
+    'Guzzle\\Service\\Description\\Parameter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Description/Parameter.php',
+    'Guzzle\\Service\\Description\\SchemaFormatter' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Description/SchemaFormatter.php',
+    'Guzzle\\Service\\Description\\SchemaValidator' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Description/SchemaValidator.php',
+    'Guzzle\\Service\\Description\\ServiceDescription' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Description/ServiceDescription.php',
+    'Guzzle\\Service\\Description\\ServiceDescriptionInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Description/ServiceDescriptionInterface.php',
+    'Guzzle\\Service\\Description\\ServiceDescriptionLoader' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Description/ServiceDescriptionLoader.php',
+    'Guzzle\\Service\\Description\\ValidatorInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Description/ValidatorInterface.php',
+    'Guzzle\\Service\\Exception\\CommandException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Exception/CommandException.php',
+    'Guzzle\\Service\\Exception\\CommandTransferException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Exception/CommandTransferException.php',
+    'Guzzle\\Service\\Exception\\DescriptionBuilderException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Exception/DescriptionBuilderException.php',
+    'Guzzle\\Service\\Exception\\InconsistentClientTransferException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Exception/InconsistentClientTransferException.php',
+    'Guzzle\\Service\\Exception\\ResponseClassException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Exception/ResponseClassException.php',
+    'Guzzle\\Service\\Exception\\ServiceBuilderException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Exception/ServiceBuilderException.php',
+    'Guzzle\\Service\\Exception\\ServiceNotFoundException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Exception/ServiceNotFoundException.php',
+    'Guzzle\\Service\\Exception\\ValidationException' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Exception/ValidationException.php',
+    'Guzzle\\Service\\Resource\\AbstractResourceIteratorFactory' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Resource/AbstractResourceIteratorFactory.php',
+    'Guzzle\\Service\\Resource\\CompositeResourceIteratorFactory' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Resource/CompositeResourceIteratorFactory.php',
+    'Guzzle\\Service\\Resource\\MapResourceIteratorFactory' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Resource/MapResourceIteratorFactory.php',
+    'Guzzle\\Service\\Resource\\Model' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Resource/Model.php',
+    'Guzzle\\Service\\Resource\\ResourceIterator' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Resource/ResourceIterator.php',
+    'Guzzle\\Service\\Resource\\ResourceIteratorApplyBatched' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Resource/ResourceIteratorApplyBatched.php',
+    'Guzzle\\Service\\Resource\\ResourceIteratorClassFactory' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Resource/ResourceIteratorClassFactory.php',
+    'Guzzle\\Service\\Resource\\ResourceIteratorFactoryInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Resource/ResourceIteratorFactoryInterface.php',
+    'Guzzle\\Service\\Resource\\ResourceIteratorInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Service/Resource/ResourceIteratorInterface.php',
+    'Guzzle\\Stream\\PhpStreamRequestFactory' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Stream/PhpStreamRequestFactory.php',
+    'Guzzle\\Stream\\Stream' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Stream/Stream.php',
+    'Guzzle\\Stream\\StreamInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Stream/StreamInterface.php',
+    'Guzzle\\Stream\\StreamRequestFactoryInterface' => $vendorDir . '/guzzle/guzzle/src/Guzzle/Stream/StreamRequestFactoryInterface.php',
+    'Guzzle\\Tests\\GuzzleTestCase' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/GuzzleTestCase.php',
+    'Guzzle\\Tests\\Http\\Message\\HeaderComparison' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Http/Message/HeaderComparison.php',
+    'Guzzle\\Tests\\Http\\Server' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Http/Server.php',
+    'Guzzle\\Tests\\Mock\\CustomResponseModel' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Mock/CustomResponseModel.php',
+    'Guzzle\\Tests\\Mock\\ErrorResponseMock' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Mock/ErrorResponseMock.php',
+    'Guzzle\\Tests\\Mock\\ExceptionMock' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Mock/ExceptionMock.php',
+    'Guzzle\\Tests\\Mock\\MockMulti' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Mock/MockMulti.php',
+    'Guzzle\\Tests\\Mock\\MockObserver' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Mock/MockObserver.php',
+    'Guzzle\\Tests\\Mock\\MockSubject' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Mock/MockSubject.php',
+    'Guzzle\\Tests\\Parser\\Cookie\\CookieParserProvider' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Parser/Cookie/CookieParserProvider.php',
+    'Guzzle\\Tests\\Parser\\Message\\MessageParserProvider' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Parser/Message/MessageParserProvider.php',
+    'Guzzle\\Tests\\Service\\Command\\LocationVisitor\\Request\\AbstractVisitorTestCase' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Service/Command/LocationVisitor/Request/AbstractVisitorTestCase.php',
+    'Guzzle\\Tests\\Service\\Mock\\Command\\IterableCommand' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Service/Mock/Command/IterableCommand.php',
+    'Guzzle\\Tests\\Service\\Mock\\Command\\MockCommand' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Service/Mock/Command/MockCommand.php',
+    'Guzzle\\Tests\\Service\\Mock\\Command\\OtherCommand' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Service/Mock/Command/OtherCommand.php',
+    'Guzzle\\Tests\\Service\\Mock\\Command\\Sub\\Sub' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Service/Mock/Command/Sub/Sub.php',
+    'Guzzle\\Tests\\Service\\Mock\\MockClient' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Service/Mock/MockClient.php',
+    'Guzzle\\Tests\\Service\\Mock\\Model\\MockCommandIterator' => $vendorDir . '/guzzle/guzzle/tests/Guzzle/Tests/Service/Mock/Model/MockCommandIterator.php',
+    'JsonSerializable' => $vendorDir . '/geoip2/geoip2/compat/JsonSerializable.php',
+    'MaxMind\\Db\\Reader' => $vendorDir . '/maxmind-db/reader/src/MaxMind/Db/Reader.php',
+    'MaxMind\\Db\\Reader\\Decoder' => $vendorDir . '/maxmind-db/reader/src/MaxMind/Db/Reader/Decoder.php',
+    'MaxMind\\Db\\Reader\\InvalidDatabaseException' => $vendorDir . '/maxmind-db/reader/src/MaxMind/Db/Reader/InvalidDatabaseException.php',
+    'MaxMind\\Db\\Reader\\Metadata' => $vendorDir . '/maxmind-db/reader/src/MaxMind/Db/Reader/Metadata.php',
+    'MaxMind\\Db\\Reader\\Util' => $vendorDir . '/maxmind-db/reader/src/MaxMind/Db/Reader/Util.php',
+    'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher' => $vendorDir . '/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php',
+    'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcher' => $vendorDir . '/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php',
+    'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcherInterface' => $vendorDir . '/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php',
+    'Symfony\\Component\\EventDispatcher\\Debug\\WrappedListener' => $vendorDir . '/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Debug/WrappedListener.php',
+    'Symfony\\Component\\EventDispatcher\\DependencyInjection\\RegisterListenersPass' => $vendorDir . '/symfony/event-dispatcher/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php',
+    'Symfony\\Component\\EventDispatcher\\Event' => $vendorDir . '/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Event.php',
+    'Symfony\\Component\\EventDispatcher\\EventDispatcher' => $vendorDir . '/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcher.php',
+    'Symfony\\Component\\EventDispatcher\\EventDispatcherInterface' => $vendorDir . '/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcherInterface.php',
+    'Symfony\\Component\\EventDispatcher\\EventSubscriberInterface' => $vendorDir . '/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventSubscriberInterface.php',
+    'Symfony\\Component\\EventDispatcher\\GenericEvent' => $vendorDir . '/symfony/event-dispatcher/Symfony/Component/EventDispatcher/GenericEvent.php',
+    'Symfony\\Component\\EventDispatcher\\ImmutableEventDispatcher' => $vendorDir . '/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php',
 );

geoswitch/trunk/vendor/composer/autoload_real.php

-                      r1041126
+                      r1162441
 // autoload_real.php @generated by Composer
 class ComposerAutoloaderInit8464b2127941ab48c5f1bc415f6fd7cf
+class ComposerAutoloaderInitc972343569c2a65fec3e90a966f2be39
+{
     private static $loader;
 …
+        }
         spl_autoload_register(array('ComposerAutoloaderInit8464b2127941ab48c5f1bc415f6fd7cf', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitc972343569c2a65fec3e90a966f2be39', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInit8464b2127941ab48c5f1bc415f6fd7cf', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitc972343569c2a65fec3e90a966f2be39', 'loadClassLoader'));
         $map = require __DIR__ . '/autoload_namespaces.php';
 …
+}
 function composerRequire8464b2127941ab48c5f1bc415f6fd7cf($file)
+function composerRequirec972343569c2a65fec3e90a966f2be39($file)
+{
     require $file;

geoswitch/trunk/vendor/composer/installed.json

-                      r1041126
+                      r1162441
+    {
         "name": "maxmind-db/reader",
         "version": "v1.0.0",
         "version_normalized": "1.0.0.0",
+        "version": "v1.0.3",
+        "version_normalized": "1.0.3.0",
         "source": {
             "type": "git",
             "url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git",
             "reference": "cbd695a5309c15249ef5944997cfb71f2a8a7963"
         },
         "dist": {
             "type": "zip",
             "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/cbd695a5309c15249ef5944997cfb71f2a8a7963",
             "reference": "cbd695a5309c15249ef5944997cfb71f2a8a7963",
+            "reference": "07f211ab596ba60f9663d9984b888f76ee1beac9"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/07f211ab596ba60f9663d9984b888f76ee1beac9",
+            "reference": "07f211ab596ba60f9663d9984b888f76ee1beac9",
             "shasum": ""
         },
 …
             "satooshi/php-coveralls": "dev-master"
         },
         "time": "2014-09-22 17:33:22",
+        "time": "2015-03-13 22:35:13",
         "type": "library",
         "installation-source": "dist",
 …
+    {
         "name": "symfony/event-dispatcher",
         "version": "v2.5.5",
         "version_normalized": "2.5.5.0",
+        "version": "v2.6.7",
+        "version_normalized": "2.6.7.0",
         "target-dir": "Symfony/Component/EventDispatcher",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/EventDispatcher.git",
             "reference": "f6281337bf5f985f585d1db6a83adb05ce531f46"
         },
         "dist": {
             "type": "zip",
             "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/f6281337bf5f985f585d1db6a83adb05ce531f46",
             "reference": "f6281337bf5f985f585d1db6a83adb05ce531f46",
+            "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/672593bc4b0043a0acf91903bb75a1c82d8f2e02",
+            "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02",
             "shasum": ""
         },
 …
         "require-dev": {
             "psr/log": "~1.0",
+            "symfony/config": "~2.0",
+            "symfony/dependency-injection": "~2.0,<2.6.0",
+            "symfony/stopwatch": "~2.2"
+            "symfony/config": "~2.0,>=2.0.5",
+            "symfony/dependency-injection": "~2.6",
+            "symfony/expression-language": "~2.6",
+            "symfony/phpunit-bridge": "~2.7",
+            "symfony/stopwatch": "~2.3"
         },
         "suggest": {
 …
             "symfony/http-kernel": ""
         },
         "time": "2014-09-28 15:56:11",
+        "time": "2015-05-02 15:18:45",
         "type": "library",
         "extra": {
             "branch-alias": {
                 "dev-master": "2.5-dev"
+                "dev-master": "2.6-dev"
+            }
         },
 …
         ],
         "authors": [
+            {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
-            },
+            {
                 "name": "Fabien Potencier",
                 "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
         ],
         "description": "Symfony EventDispatcher Component",
         "homepage": "http://symfony.com"
+        "homepage": "https://symfony.com"
     },
+    {
         "name": "guzzle/guzzle",
         "version": "v3.9.2",
         "version_normalized": "3.9.2.0",
+        "version": "v3.9.3",
+        "version_normalized": "3.9.3.0",
         "source": {
             "type": "git",
             "url": "https://github.com/guzzle/guzzle3.git",
             "reference": "54991459675c1a2924122afbb0e5609ade581155"
         },
         "dist": {
             "type": "zip",
             "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/54991459675c1a2924122afbb0e5609ade581155",
             "reference": "54991459675c1a2924122afbb0e5609ade581155",
+            "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9",
+            "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9",
             "shasum": ""
         },
 …
             "zendframework/zend-log": "2.*,<2.3"
         },
+        "time": "2014-08-11 04:32:36",
+        "suggest": {
+            "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated."
+        },
+        "time": "2015-03-18 18:23:50",
         "type": "library",
         "extra": {
 …
+            }
         ],
         "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
+        "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle",
         "homepage": "http://guzzlephp.org/",
         "keywords": [
 …
+    {
         "name": "geoip2/geoip2",
         "version": "v2.0.0",
         "version_normalized": "2.0.0.0",
+        "version": "v2.1.1",
+        "version_normalized": "2.1.1.0",
         "source": {
             "type": "git",
             "url": "https://github.com/maxmind/GeoIP2-php.git",
             "reference": "c58034524e0d20e9bcff16b5f9f8f2633f921ab5"
         },
         "dist": {
             "type": "zip",
             "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/c58034524e0d20e9bcff16b5f9f8f2633f921ab5",
             "reference": "c58034524e0d20e9bcff16b5f9f8f2633f921ab5",
+            "reference": "01f58d749b715f30c99d1b19a965ce5b93813656"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/01f58d749b715f30c99d1b19a965ce5b93813656",
+            "reference": "01f58d749b715f30c99d1b19a965ce5b93813656",
             "shasum": ""
         },
 …
         },
         "require-dev": {
-            "apigen/apigen": "~2.8.0",
-            "nette/nette": "~2.1.3",
             "phpunit/phpunit": "4.2.*",
             "satooshi/php-coveralls": "dev-master"
         },
         "time": "2014-09-22 17:49:45",
+        "time": "2014-12-03 14:59:16",
         "type": "library",
         "installation-source": "dist",

geoswitch/trunk/vendor/geoip2/geoip2/CHANGELOG.md

-                      r1041126
+                      r1162441
 CHANGELOG
 =========
+.1.1 (2014-12-03)
+------------------
+* The 2.1.0 Phar builds included a shebang line, causing issues when loading
+  it as a library. This has been corrected. GitHub #33.
+.1.0 (2014-10-29)
+------------------
+* Update ApiGen dependency to version that isn't broken on case sensitive
+  file systems.
+* Added support for the GeoIP2 Anonymous IP database. The
+  `GeoIP2\Database\Reader` class now has an `anonymousIp` method which returns
+  a `GeoIP2\Model\AnonymousIp` object.
+* Boolean attributes like those in the `GeoIP2\Record\Traits` class now return
+ `false` instead of `null` when they were not true.
 .0.0 (2014-09-22)

geoswitch/trunk/vendor/geoip2/geoip2/README.md

-                      r1041126
+                      r1162441
 ```
+### Anonymous IP Example ###
+```php
+<?php
+require_once 'vendor/autoload.php';
+use GeoIp2\Database\Reader;
+// This creates the Reader object, which should be reused across
+// lookups.
+$reader = new Reader('/usr/local/share/GeoIP/GeoIP2-Anonymous-IP.mmdb');
+$record = $reader->anonymousIp('128.101.101.101');
+if ($record->isAnonymous) { print "anon\n"; }
+print($record->ipAddress . "\n"); // '128.101.101.101'
+```
 ### Connection-Type Example ###
 …
 The only piece of data which is always returned is the `ipAddress`
 attribute in the `GeoIp2\Record\Traits` record.
-Every record class attribute has a corresponding predicate method so you can
-check to see if the attribute is set.
 ## Integration with GeoNames ##

geoswitch/trunk/vendor/geoip2/geoip2/box.json

-                      r1041126
+                      r1162441
+        {
             "name": [
+                "LICENSE",
+                "LICENSE.*",
                 "*.php",
                 "*.pem",
 …
+            }
     ],
     "directories": ["compat", "src/"],
     "git-version": "git-version",
+    "shebang": "",
     "stub": true
+}

geoswitch/trunk/vendor/geoip2/geoip2/composer.json

r1041126	r1162441
19	19	},
20	20	"require-dev": {
21		~~"apigen/apigen": "~2.8.0",~~
22		~~"nette/nette": "~2.1.3",~~
23	21	"phpunit/phpunit": "4.2.*",
24	22	"satooshi/php-coveralls": "dev-master"

geoswitch/trunk/vendor/geoip2/geoip2/src/GeoIp2/Database/Reader.php

-                      r1041126
+                      r1162441
 /**
  * Instances of this class provide a reader for the GeoIP2 database format.
+ * IP addresses can be looked up using the <code>country</code>
+ * and <code>city</code> methods. We also provide <code>cityIspOrg</code>
+ * and <code>omni</code> methods to ease compatibility with the web service
+ * client, although we may offer the ability to specify additional databases
+ * to replicate these web services in the future (e.g., the ISP/Org database).
+ *
+ * **Usage**
+ * IP addresses can be looked up using the database specific methods.
+ *
+ * ## Usage ##
+ *
  * The basic API for this class is the same for every database. First, you
 …
  * each of which represents part of the data returned by the database. If
  * the database does not contain the requested information, the attributes
  * on the record class will have a <code>null</code> value.
+ * on the record class will have a `null` value.
+ *
  * If the address is not in the database, an
 …
+    }
+    /**
+     * This method returns a GeoIP2 Anonymous IP model.
+     *
+     * @param string $ipAddress IPv4 or IPv6 address as a string.
+     *
+     * @return \GeoIp2\Model\AnonymousIp
+     *
+     * @throws \GeoIp2\Exception\AddressNotFoundException if the address is
+     *         not in the database.
+     * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database
+     *         is corrupt or invalid
+     */
+    public function anonymousIp($ipAddress)
+    {
+        return $this->flatModelFor(
+            'AnonymousIp',
+            'GeoIP2-Anonymous-IP',
+            $ipAddress
+        );
+    }
+    /**
+     * This method returns a GeoIP2 Connection Type model.
+     *
+     * @param string $ipAddress IPv4 or IPv6 address as a string.
+     *
+     * @return \GeoIp2\Model\ConnectionType
+     *
+     * @throws \GeoIp2\Exception\AddressNotFoundException if the address is
+     *         not in the database.
+     * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database
+     *         is corrupt or invalid
+     */
     public function connectionType($ipAddress)
+    {
 …
+    }
+    /**
+     * This method returns a GeoIP2 Domain model.
+     *
+     * @param string $ipAddress IPv4 or IPv6 address as a string.
+     *
+     * @return \GeoIp2\Model\Domain
+     *
+     * @throws \GeoIp2\Exception\AddressNotFoundException if the address is
+     *         not in the database.
+     * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database
+     *         is corrupt or invalid
+     */
     public function domain($ipAddress)
+    {
 …
+    }
+    /**
+     * This method returns a GeoIP2 ISP model.
+     *
+     * @param string $ipAddress IPv4 or IPv6 address as a string.
+     *
+     * @return \GeoIp2\Model\Isp
+     *
+     * @throws \GeoIp2\Exception\AddressNotFoundException if the address is
+     *         not in the database.
+     * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database
+     *         is corrupt or invalid
+     */
     public function isp($ipAddress)
+    {

geoswitch/trunk/vendor/geoip2/geoip2/src/GeoIp2/Model/AbstractModel.php

-                      r1041126
+                      r1162441
     protected function get($field)
+    {
+        return isset($this->raw[$field]) ? $this->raw[$field] : null;
+        if (isset($this->raw[$field])) {
+            return $this->raw[$field];
+        } else {
+            if (preg_match('/^is_/', $field)) {
+                return false;
+            } else {
+                return null;
+            }
+        }
+    }

geoswitch/trunk/vendor/geoip2/geoip2/src/GeoIp2/Record/AbstractRecord.php

-                      r1041126
+                      r1162441
             return $this->record[$key];
         } elseif ($this->validAttribute($attr)) {
+            return null;
+            if (preg_match('/^is_/', $key)) {
+                return false;
+            } else {
+                return null;
+            }
         } else {
             throw new \RuntimeException("Unknown attribute: $attr");

geoswitch/trunk/vendor/geoip2/geoip2/src/GeoIp2/WebService/Client.php

-                      r1041126
+                      r1162441
  * which case all of the attributes for that record class will be empty.
+ *
  * **Usage**
+ * ## Usage ##
+ *
  * The basic API for this class is the same for all of the web service end
+ * points. First you create a web service object with your MaxMind
+ * <code>$userId</code> and <code>$licenseKey</code>, then you call the method
+ * corresponding to a specific end point, passing it the IP address you want
+ * to look up.
+ * points. First you create a web service object with your MaxMind `$userId`
+ * and `$licenseKey`, then you call the method corresponding to a specific end
+ * point, passing it the IP address you want to look up.
+ *
  * If the request succeeds, the method call will return a model class for

geoswitch/trunk/vendor/guzzle/guzzle/CHANGELOG.md

-                      r1041126
+                      r1162441
+CHANGELOG
+=========
+.9.2 (2014-09-10)
+------------------
+# CHANGELOG
+## 3.9.3 - 2015-03-18
+* Ensuring Content-Length is not stripped from a request when it is `0`.
+* Added more information to stream wrapper exceptions.
+* Message parser will no longer throw warnings for malformed messages.
+* Giving a valid cache TTL when max-age is 0.
+## 3.9.2 - 2014-09-10
 * Retrying "Connection died, retrying a fresh connect" curl errors.
 …
 * Added EntityBody support for OPTIONS requests.
+.9.1 (2014-05-07)
+------------------
+## 3.9.1 - 2014-05-07
 * Added a fix to ReadLimitEntityBody to ensure it doesn't infinitely loop.
 …
   returns a falsey value, it still continues to consume the stream until EOF.
+.9.0 (2014-04-23)
+------------------
+## 3.9.0 - 2014-04-23
 * `null`, `false`, and `"_guzzle_blank_"` all now serialize as an empty value
 …
 * Fixing invalid usage of an out of range PHP feature in the ErrorResponsePlugin
+.8.1 (2014-01-28)
+------------------
+## 3.8.1 -2014-01-28
 * Bug: Always using GET requests when redirecting from a 303 response
 …
 * Network access is now disabled when loading XML documents
+.8.0 (2013-12-05)
+------------------
+## 3.8.0 - 2013-12-05
 * Added the ability to define a POST name for a file
 …
 * Cleaned up build scripts
+.7.4 (2013-10-02)
+------------------
+## 3.7.4 - 2013-10-02
 * Bug fix: 0 is now an allowed value in a description parameter that has a default value (#430)
 …
 * OauthPlugin now supports adding authentication to headers or query string (#425)
+.7.3 (2013-09-08)
+------------------
+## 3.7.3 - 2013-09-08
 * Added the ability to get the exception associated with a request/command when using `MultiTransferException` and
 …
 * Bug fix: mimetype guessing based on a filename is now case-insensitive
+.7.2 (2013-08-02)
+------------------
+## 3.7.2 - 2013-08-02
 * Bug fix: Properly URL encoding paths when using the PHP-only version of the UriTemplate expander
 …
 * cURL multi cleanup and optimizations
+.7.1 (2013-07-05)
+------------------
+## 3.7.1 - 2013-07-05
 * Bug fix: Setting default options on a client now works
 …
 * Not setting a `Content-MD5` on a command if calculating the Content-MD5 fails via the CommandContentMd5Plugin
+.7.0 (2013-06-10)
+------------------
+## 3.7.0 - 2013-06-10
 * See UPGRADING.md for more information on how to upgrade.
 …
 * Added `RevalidationInterface::shouldRevalidate(RequestInterface $request, Response $response)`
+.6.0 (2013-05-29)
+------------------
+## 3.6.0 - 2013-05-29
 * ServiceDescription now implements ToArrayInterface
 …
 * Added the ability to cast Model objects to a string to view debug information.
+.5.0 (2013-05-13)
+------------------
+## 3.5.0 - 2013-05-13
 * Bug: Fixed a regression so that request responses are parsed only once per oncomplete event rather than multiple times
 …
 * Added `getEffectiveUrl()` and `getRedirectCount()` to Response objects
+.4.3 (2013-04-30)
+------------------
+## 3.4.3 - 2013-04-30
 * Bug fix: Fixing bug introduced in 3.4.2 where redirect responses are duplicated on the final redirected response
 * Added a check to re-extract the temp cacert bundle from the phar before sending each request
+.4.2 (2013-04-29)
+------------------
+## 3.4.2 - 2013-04-29
 * Bug fix: Stream objects now work correctly with "a" and "a+" modes
 …
 * Configuration loading now allows remote files
+.4.1 (2013-04-16)
+------------------
+## 3.4.1 - 2013-04-16
 * Large refactoring to how CurlMulti handles work. There is now a proxy that sits in front of a pool of CurlMulti
 …
 * Added support to attempt to retrieve a command first literally, then ucfirst, the with inflection
+.4.0 (2013-04-11)
+------------------
+## 3.4.0 - 2013-04-11
 * Bug fix: URLs are now resolved correctly based on http://tools.ietf.org/html/rfc3986#section-5.2. #289
 …
 * Lots of cleanup to CurlHandle::factory and RequestFactory::createRequest
+.3.1 (2013-03-10)
+------------------
+## 3.3.1 - 2013-03-10
 * Added the ability to create PHP streaming responses from HTTP requests
 …
 * Added xmlAllowEmpty to serialize an XML body even if no XML specific parameters are set
+.3.0 (2013-03-03)
+------------------
+## 3.3.0 - 2013-03-03
 * A large number of performance optimizations have been made
 …
     * Debug headers can now added to cached response in the CachePlugin
+.2.0 (2013-02-14)
+------------------
+## 3.2.0 - 2013-02-14
 * CurlMulti is no longer reused globally. A new multi object is created per-client. This helps to isolate clients.
 …
 * Bug fix: Guzzle now takes the first found value when grabbing Cache-Control directives
+.1.2 (2013-01-27)
+------------------
+## 3.1.2 - 2013-01-27
 * Refactored how operation responses are parsed. Visitors now include a before() method responsible for parsing the
 …
 * Setting default headers on a client after setting the user-agent will not erase the user-agent setting
+.1.1 (2013-01-20)
+------------------
+## 3.1.1 - 2013-01-20
 * Adding wildcard support to Guzzle\Common\Collection::getPath()
 …
 * Adding Guzzle\Service\Resource\CompositeResourceIteratorFactory and cleaning up factory interface
+.1.0 (2013-01-12)
+------------------
+## 3.1.0 - 2013-01-12
 * BC: CurlException now extends from RequestException rather than BadResponseException
 …
 * Added getModels to ServiceDescriptionInterface
+.0.7 (2012-12-19)
+------------------
+## 3.0.7 - 2012-12-19
 * Fixing phar detection when forcing a cacert to system if null or true
 …
 * Adding a response_body location to service descriptions
+.0.6 (2012-12-09)
+------------------
+## 3.0.6 - 2012-12-09
 * CurlMulti performance improvements
 …
 * composer.json tweaks
+.0.5 (2012-11-18)
+------------------
+## 3.0.5 - 2012-11-18
 * Bug: Fixing an infinite recursion bug caused from revalidating with the CachePlugin
 …
 * Added better mimetype guessing to requests and post files
+.0.4 (2012-11-11)
+------------------
+## 3.0.4 - 2012-11-11
 * Bug: Fixed a bug when adding multiple cookies to a request to use the correct glue value
 …
 * Added the ability to create any sort of hash for a stream rather than just an MD5 hash
+.0.3 (2012-11-04)
+------------------
+## 3.0.3 - 2012-11-04
 * Implementing redirects in PHP rather than cURL
 …
 * Fixing OauthPlugin to create unique nonce values per request
+.0.2 (2012-10-25)
+------------------
+## 3.0.2 - 2012-10-25
 * Magic methods are enabled by default on clients
 …
 * Bug: Fixed an issue with URI templates where null template variables were being expanded
+.0.1 (2012-10-22)
+------------------
+## 3.0.1 - 2012-10-22
 * Models can now be used like regular collection objects by calling filter, map, etc
 …
 * Added a custom AppendIterator to get around a PHP bug with the `\AppendIterator`
+.0.0 (2012-10-15)
+------------------
+## 3.0.0 - 2012-10-15
 * Rewrote service description format to be based on Swagger
 …
 * Fixed ZF2 cache adapters
+.8.8 (2012-10-15)
+------------------
+## 2.8.8 - 2012-10-15
 * Bug: Fixed a cookie issue that caused dot prefixed domains to not match where popular browsers did
+.8.7 (2012-09-30)
+------------------
+## 2.8.7 - 2012-09-30
 * Bug: Fixed config file aliases for JSON includes
 …
 * OAuth plugin now supports 2-legged OAuth
+.8.6 (2012-09-05)
+------------------
+## 2.8.6 - 2012-09-05
 * Added the ability to modify and build service descriptions
 …
   '_default' with a default JSON configuration file.
+.8.5 (2012-08-29)
+------------------
+## 2.8.5 - 2012-08-29
 * Bug: Suppressed empty arrays from URI templates
 …
 * Added a way to get the data used when signing an Oauth request before a request is sent
+.8.4 (2012-08-15)
+------------------
+## 2.8.4 - 2012-08-15
 * Bug: Custom delay time calculations are no longer ignored in the ExponentialBackoffPlugin
 …
 * LogPlugin now exposes request and response objects in the extras array
+.8.3 (2012-07-30)
+------------------
+## 2.8.3 - 2012-07-30
 * Bug: Fixed a case where empty POST requests were sent as GET requests
 …
 * Changed CurlMulti::perform to pass a smaller timeout to CurlMulti::executeHandles
+.8.2 (2012-07-24)
+------------------
+## 2.8.2 - 2012-07-24
 * Bug: Query string values set to 0 are no longer dropped from the query string
 …
 * Allowing dot notation for class paths in filters attribute of a service descriptions
+.8.1 (2012-07-16)
+------------------
+## 2.8.1 - 2012-07-16
 * Loosening Event Dispatcher dependency
 * POST redirects can now be customized using CURLOPT_POSTREDIR
+.8.0 (2012-07-15)
+------------------
+## 2.8.0 - 2012-07-15
 * BC: Guzzle\Http\Query
 …
 * Bug: URI template variables set to null are no longer expanded
+.7.2 (2012-07-02)
+------------------
+## 2.7.2 - 2012-07-02
 * BC: Moving things to get ready for subtree splits. Moving Inflection into Common. Moving Guzzle\Http\Parser to Guzzle\Parser.
 …
 * Batch divisors can now return iterators or arrays
+.7.1 (2012-06-26)
+------------------
+## 2.7.1 - 2012-06-26
 * Minor patch to update version number in UA string
 * Updating build process
+.7.0 (2012-06-25)
+------------------
+## 2.7.0 - 2012-06-25
 * BC: Inflection classes moved to Guzzle\Inflection. No longer static methods. Can now inject custom inflectors into classes.
 …
 * Added Guzzle\Common\Log\ArrayLogAdapter
+.6.6 (2012-06-10)
+------------------
+## 2.6.6 - 2012-06-10
 * BC: Removing Guzzle\Http\Plugin\BatchQueuePlugin
 …
 * Bug: Changed the default cookie header casing back to 'Cookie'
+.6.5 (2012-06-03)
+------------------
+## 2.6.5 - 2012-06-03
 * BC: Renaming Guzzle\Http\Message\RequestInterface::getResourceUri() to getResource()
 …
 * Making it easier to add event subscribers to HasDispatcherInterface classes. Can now directly call addSubscriber()
+.6.4 (2012-05-30)
+------------------
+## 2.6.4 - 2012-05-30
 * BC: Cleaning up how POST files are stored in EntityEnclosingRequest objects. Adding PostFile class.
 …
 * Parsing location and type sub values when instantiating a service description rather than over and over at runtime
+.6.3 (2012-05-23)
+------------------
+## 2.6.3 - 2012-05-23
 * [BC] Guzzle\Common\FromConfigInterface no longer requires any config options.
 …
 * CS updates
+.6.2 (2012-05-19)
+------------------
+## 2.6.2 - 2012-05-19
 * [Http] Better handling of nested scope requests in CurlMulti.  Requests are now always prepares in the send() method rather than the addRequest() method.
+.6.1 (2012-05-19)
+------------------
+## 2.6.1 - 2012-05-19
 * [BC] Removing 'path' support in service descriptions.  Use 'uri'.
 …
 * Making the method signature of Guzzle\Service\Builder\ServiceBuilder::factory more flexible.
+.6.0 (2012-05-15)
+------------------
+## 2.6.0 - 2012-05-15
 * [BC] Moving Guzzle\Service\Builder to Guzzle\Service\Builder\ServiceBuilder
 …
 * Moving the parseQuery method out of Url and on to QueryString::fromString() as a static factory method.
+.5.0 (2012-05-08)
+------------------
+## 2.5.0 - 2012-05-08
 * Major performance improvements

geoswitch/trunk/vendor/guzzle/guzzle/README.md

-                      r1041126
+                      r1162441
 # This is an old version of Guzzle
 This repository is for Guzzle 3.x. Guzzle 4.x, the new version of Guzzle, has
+This repository is for Guzzle 3.x. Guzzle 5.x, the new version of Guzzle, has
 been released and is available at
 [https://github.com/guzzle/guzzle](https://github.com/guzzle/guzzle). The
 documentation for Guzzle version 4+ can be found at
+documentation for Guzzle version 5+ can be found at
 [http://guzzlephp.org](http://guzzlephp.org).
+Guzzle 3 is only maintained for bug and security fixes. Guzzle 3 will be EOL
+at some point in late 2015.
 ### About Guzzle 3
 …
 require 'vendor/autoload.php';
 ```
+## Known Issues
+. Problem following a specific redirect: https://github.com/guzzle/guzzle/issues/385.
+   This has been fixed in Guzzle 4/5.
+. Root XML attributes not serialized in a service description: https://github.com/guzzle/guzzle3/issues/5.
+   This has been fixed in Guzzle 4/5.
+. Accept-Encoding not preserved when following redirect: https://github.com/guzzle/guzzle3/issues/9
+   Fixed in Guzzle 4/5.
+. String "Array" Transmitted w/ PostFiles and Duplicate Aggregator: https://github.com/guzzle/guzzle3/issues/10
+   Fixed in Guzzle 4/5.
+. Recursive model references with array items: https://github.com/guzzle/guzzle3/issues/13
+   Fixed in Guzzle 4/5
+. String "Array" Transmitted w/ PostFiles and Duplicate Aggregator: https://github.com/guzzle/guzzle3/issues/10
+   Fixed in Guzzle 4/5.

geoswitch/trunk/vendor/guzzle/guzzle/composer.json

-                      r1041126
+                      r1162441
     "name": "guzzle/guzzle",
     "type": "library",
     "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
+    "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle",
     "keywords": ["framework", "http", "rest", "web service", "curl", "client", "HTTP client"],
     "homepage": "http://guzzlephp.org/",
 …
     },
+    "suggest": {
+        "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated."
+    },
+    "scripts": {
+        "test": "phpunit"
+    },
     "require-dev": {
         "doctrine/cache": "~1.3",

geoswitch/trunk/vendor/guzzle/guzzle/src/Guzzle/Cache/DoctrineCacheAdapter.php

r1041126	r1162441
37	37	public function save($id, $data, $lifeTime = false, array $options = null)
38	38	{
39		return $this->cache->save($id, $data, $lifeTime);
	39	return $this->cache->save($id, $data, $lifeTime !== false ? $lifeTime : 0);
40	40	}
41	41	}

geoswitch/trunk/vendor/guzzle/guzzle/src/Guzzle/Common/Version.php

r1041126	r1162441
8	8	class Version
9	9	{
10		const VERSION = '3.9.2';
	10	const VERSION = '3.9.3';
11	11
12	12	/**

geoswitch/trunk/vendor/guzzle/guzzle/src/Guzzle/Http/Curl/CurlHandle.php

r1041126	r1162441
194	194
195	195	// Add the content-length header back if it was temporarily removed
196		if ($tempContentLength) {
	196	if (null !== $tempContentLength) {
197	197	$request->setHeader('Content-Length', $tempContentLength);
198	198	}

geoswitch/trunk/vendor/guzzle/guzzle/src/Guzzle/Http/ReadLimitEntityBody.php

-                      r1041126
+                      r1162441
 namespace Guzzle\Http;
+use Guzzle\Stream\StreamInterface;
 /**
 …
     public function __toString()
+    {
+        return substr((string) $this->body, $this->offset, $this->limit) ?: '';
+        if (!$this->body->isReadable() ||
+            (!$this->body->isSeekable() && $this->body->isConsumed())
+        ) {
+            return '';
+        }
+        $originalPos = $this->body->ftell();
+        $this->body->seek($this->offset);
+        $data = '';
+        while (!$this->feof()) {
+            $data .= $this->read(1048576);
+        }
+        $this->body->seek($originalPos);
+        return (string) $data ?: '';
+    }

geoswitch/trunk/vendor/guzzle/guzzle/src/Guzzle/Http/Resources/cacert.pem

-                      r1041126
+                      r1162441
 ##
 ## ca-bundle.crt -- Bundle of CA Root Certificates
+## Bundle of CA Root Certificates
 ##
 ## Certificate data from Mozilla as of: Tue Apr 22 08:29:31 2014
+## Certificate data from Mozilla downloaded on: Wed Aug 13 21:49:32 2014
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
 ## file (certdata.txt).  This file can be found in the mozilla source tree:
 ## http://mxr.mozilla.org/mozilla-release/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
+## http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
 ##
 ## It contains the certificates in PEM format and therefore
 …
 ## an Apache+mod_ssl webserver for SSL client authentication.
 ## Just configure this file as the SSLCACertificateFile.
+##
+## Conversion done with mk-ca-bundle.pl verison 1.22.
+## SHA1: bf2c15b3019e696660321d2227d942936dc50aa7
 ##
 …
 mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
 -----END CERTIFICATE-----

geoswitch/trunk/vendor/guzzle/guzzle/src/Guzzle/Parser/Message/MessageParser.php

r1041126	r1162441
34	34	);
35	35
36		$parsed['request_url'] = $this->getUrlPartsFromMessage(~~$parts['start_line'][1]~~, $parsed);
	36	$parsed['request_url'] = $this->getUrlPartsFromMessage(isset($parts['start_line'][1]) ? $parts['start_line'][1] : '' , $parsed);
37	37
38	38	return $parsed;

geoswitch/trunk/vendor/guzzle/guzzle/src/Guzzle/Plugin/Cache/DefaultCacheStorage.php

-                      r1041126
+                      r1162441
+    {
         $currentTime = time();
+        $ttl = $request->getParams()->get('cache.override_ttl') ?: $response->getMaxAge() ?: $this->defaultTtl;
+        $overrideTtl = $request->getParams()->get('cache.override_ttl');
+        if ($overrideTtl) {
+            $ttl = $overrideTtl;
+        } else {
+            $maxAge = $response->getMaxAge();
+            if ($maxAge !== null) {
+                $ttl = $maxAge;
+            } else {
+                $ttl = $this->defaultTtl;
+            }
+        }
         if ($cacheControl = $response->getHeader('Cache-Control')) {
             $stale = $cacheControl->getDirective('stale-if-error');
+            $ttl += $stale == true ? $ttl : $stale;
+            if ($stale === true) {
+                $ttl += $ttl;
+            } else if (is_numeric($stale)) {
+                $ttl += $stale;
+            }
+        }

geoswitch/trunk/vendor/guzzle/guzzle/src/Guzzle/Service/Description/Operation.php

r1041126	r1162441
87	87	* - deprecated: (bool) Set to true if this is a deprecated command
88	88	* - errorResponses: (array) Errors that could occur when executing the command. Array of hashes, each with a
89		* 'code' (the HTTP response code), '~~phrase~~' (response reason phrase or description of the
	89	* 'code' (the HTTP response code), 'reason' (response reason phrase or description of the
90	90	* error), and 'class' (a custom exception class that would be thrown if the error is
91	91	* encountered).

geoswitch/trunk/vendor/guzzle/guzzle/src/Guzzle/Stream/PhpStreamRequestFactory.php

-                      r1041126
+                      r1162441
     protected function createResource($callback)
+    {
+        // Turn off error reporting while we try to initiate the request
+        $level = error_reporting(0);
+        $errors = null;
+        set_error_handler(function ($_, $msg, $file, $line) use (&$errors) {
+            $errors[] = array(
+                'message' => $msg,
+                'file'    => $file,
+                'line'    => $line
+            );
+            return true;
+        });
         $resource = call_user_func($callback);
+        error_reporting($level);
+        // If the resource could not be created, then grab the last error and throw an exception
+        if (false === $resource) {
+        restore_error_handler();
+        if (!$resource) {
             $message = 'Error creating resource. ';
+            foreach (error_get_last() as $key => $value) {
+                $message .= "[{$key}] {$value} ";
+            foreach ($errors as $err) {
+                foreach ($err as $key => $value) {
+                    $message .= "[$key] $value" . PHP_EOL;
+                }
+            }
             throw new RuntimeException(trim($message));

geoswitch/trunk/vendor/maxmind-db/reader/CHANGELOG.md

-                      r1041126
+                      r1162441
 CHANGELOG
 =========
+.0.3 (2015-03-13)
+------------------
+* All uses of `strlen` were removed. This should prevent issues in situations
+  where the function is overloaded or otherwise broken.
+.0.2 (2015-01-19)
+------------------
+* Previously the MaxMind DB extension would cause a segfault if the Reader
+  object's destructor was called without first having called the constructor.
+  (Reported by Matthias Saou & Juan Peri. GitHub #20.)
+.0.1 (2015-01-12)
+------------------
+* In the last several releases, the version number in the extension was
+  incorrect. This release is being done to correct it. No other code changes
+  are included.
 .0.0 (2014-09-22)

geoswitch/trunk/vendor/maxmind-db/reader/src/MaxMind/Db/Reader.php

-                      r1041126
+                      r1162441
 class Reader
+{
+    private $DATA_SECTION_SEPARATOR_SIZE = 16;
+    private $METADATA_START_MARKER = "\xAB\xCD\xEFMaxMind.com";
+    private static $DATA_SECTION_SEPARATOR_SIZE = 16;
+    private static $METADATA_START_MARKER = "\xAB\xCD\xEFMaxMind.com";
+    private static $METADATA_START_MARKER_LENGTH = 14;
     private $decoder;
 …
         $this->decoder = new Decoder(
             $this->fileHandle,
             $this->metadata->searchTreeSize + $this->DATA_SECTION_SEPARATOR_SIZE
+            $this->metadata->searchTreeSize + self::$DATA_SECTION_SEPARATOR_SIZE
         );
+    }
 …
         $fstat = fstat($handle);
         $fileSize = $fstat['size'];
         $marker = $this->METADATA_START_MARKER;
         $markerLength = Util::stringLength($marker);
+        $marker = self::$METADATA_START_MARKER;
+        $markerLength = self::$METADATA_START_MARKER_LENGTH;
         for ($i = 0; $i < $fileSize - $markerLength + 1; $i++) {

geoswitch/trunk/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Decoder.php

-                      r1041126
+                      r1162441
             case 'uint64':
             case 'uint128':
                 return array($this->decodeBigUint($bytes), $newOffset);
+                return array($this->decodeBigUint($bytes, $size), $newOffset);
             default:
                 throw new InvalidDatabaseException(
 …
+    }
     private function decodeBigUint($bytes)
+    private function decodeBigUint($bytes, $byteLength)
+    {
         $maxUintBytes = log(PHP_INT_MAX, 2) / 8;
+        $byteLength = Util::stringLength($bytes);
         if ($byteLength == 0) {
             return 0;
 …
             $size = 285 + $decoded;
         } elseif ($size > 30) {
             $size = ($decoded & (0x0FFFFFFF >> (32 - (8 * $bytesToRead))))
                 + 65821;

geoswitch/trunk/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Util.php

r1041126	r1162441
7	7	class Util
8	8	{
9
10	9	public static function read($stream, $offset, $numberOfBytes)
11	10	{
…	…
27	26	);
28	27	}
29
30		~~public static function stringLength($string)~~
31		{
32		~~if (function_exists('mb_strlen')) {~~
33		~~return mb_strlen($string, '8bit');~~
34		}
35
36		~~return strlen($string);~~
37		}
38	28	}

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php

-                      r1041126
+                      r1162441
 /**
  * Lazily loads listeners and subscribers from the dependency injection
  * container
+ * container.
+ *
  * @author Fabien Potencier <fabien@symfony.com>
 …
+{
     /**
+     * The container from where services are loaded
+     * The container from where services are loaded.
+     *
      * @var ContainerInterface
      */
 …
     /**
+     * The service IDs of the event listeners and subscribers
+     * The service IDs of the event listeners and subscribers.
+     *
      * @var array
      */
 …
     /**
+     * The services registered as listeners
+     * The services registered as listeners.
+     *
      * @var array
      */
 …
     /**
      * Adds a service as event listener
+     * Adds a service as event listener.
+     *
      * @param string $eventName Event for which the listener is added
      * @param array  $callback  The service ID of the listener service & the method
      *                            name that has to be called
      * @param int     $priority The higher this value, the earlier an event listener
      *                            will be triggered in the chain.
      *                            Defaults to 0.
+     *                          name that has to be called
+     * @param int    $priority  The higher this value, the earlier an event listener
+     *                          will be triggered in the chain.
+     *                          Defaults to 0.
+     *
      * @throws \InvalidArgumentException
 …
         $this->lazyLoad($eventName);
+        if (isset($this->listeners[$eventName])) {
+            foreach ($this->listeners[$eventName] as $key => $l) {
+                foreach ($this->listenerIds[$eventName] as $i => $args) {
+                    list($serviceId, $method, $priority) = $args;
+                    if ($key === $serviceId.'.'.$method) {
+                        if ($listener === array($l, $method)) {
+                            unset($this->listeners[$eventName][$key]);
+                            if (empty($this->listeners[$eventName])) {
+                                unset($this->listeners[$eventName]);
+                            }
+                            unset($this->listenerIds[$eventName][$i]);
+                            if (empty($this->listenerIds[$eventName])) {
+                                unset($this->listenerIds[$eventName]);
+                            }
+                        }
+        if (isset($this->listenerIds[$eventName])) {
+            foreach ($this->listenerIds[$eventName] as $i => $args) {
+                list($serviceId, $method, $priority) = $args;
+                $key = $serviceId.'.'.$method;
+                if (isset($this->listeners[$eventName][$key]) && $listener === array($this->listeners[$eventName][$key], $method)) {
+                    unset($this->listeners[$eventName][$key]);
+                    if (empty($this->listeners[$eventName])) {
+                        unset($this->listeners[$eventName]);
+                    }
+                    unset($this->listenerIds[$eventName][$i]);
+                    if (empty($this->listenerIds[$eventName])) {
+                        unset($this->listenerIds[$eventName]);
+                    }
+                }
 …
     /**
      * @see EventDispatcherInterface::hasListeners
+     * @see EventDispatcherInterface::hasListeners()
      */
     public function hasListeners($eventName = null)
 …
     /**
      * @see EventDispatcherInterface::getListeners
+     * @see EventDispatcherInterface::getListeners()
      */
     public function getListeners($eventName = null)
+    {
         if (null === $eventName) {
             foreach (array_keys($this->listenerIds) as $serviceEventName) {
+            foreach ($this->listenerIds as $serviceEventName => $args) {
                 $this->lazyLoad($serviceEventName);
+            }
 …
     /**
      * Adds a service as event subscriber
+     * Adds a service as event subscriber.
+     *
      * @param string $serviceId The service ID of the subscriber service

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php

-                      r1041126
+                      r1162441
     private $called;
     private $dispatcher;
+    private $wrappedListeners;
     /**
 …
         $this->logger = $logger;
         $this->called = array();
+        $this->wrappedListeners = array();
+    }
 …
     public function removeListener($eventName, $listener)
+    {
+        if (isset($this->wrappedListeners[$eventName])) {
+            foreach ($this->wrappedListeners[$eventName] as $index => $wrappedListener) {
+                if ($wrappedListener->getWrappedListener() === $listener) {
+                    $listener = $wrappedListener;
+                    unset($this->wrappedListeners[$eventName][$index]);
+                    break;
+                }
+            }
+        }
         return $this->dispatcher->removeListener($eventName, $listener);
+    }
 …
             $info = $this->getListenerInfo($listener, $eventName);
             $name = isset($info['class']) ? $info['class'] : $info['type'];
+            $this->dispatcher->addListener($eventName, new WrappedListener($listener, $name, $this->stopwatch));
+            $wrappedListener = new WrappedListener($listener, $name, $this->stopwatch, $this);
+            $this->wrappedListeners[$eventName][] = $wrappedListener;
+            $this->dispatcher->addListener($eventName, $wrappedListener);
+        }
+    }
 …
     private function postProcess($eventName)
+    {
+        unset($this->wrappedListeners[$eventName]);
         $skipped = false;
         foreach ($this->dispatcher->getListeners($eventName) as $listener) {
+            if (!$listener instanceof WrappedListener) { // #12845: a new listener was added during dispatch.
+                continue;
+            }
             // Unwrap listener
             $this->dispatcher->removeListener($eventName, $listener);
 …
     /**
      * Returns information about the listener
+     * Returns information about the listener.
+     *
      * @param object $listener  The listener
 …
+            }
             $info += array(
                 'type'  => 'Function',
+                'type' => 'Function',
                 'function' => $listener,
                 'file'  => $file,
                 'line'  => $line,
+                'file' => $file,
+                'line' => $line,
                 'pretty' => $listener,
             );
 …
+            }
             $info += array(
                 'type'  => 'Method',
+                'type' => 'Method',
                 'class' => $class,
                 'method' => $listener[1],
                 'file'  => $file,
                 'line'  => $line,
+                'file' => $file,
+                'line' => $line,
                 'pretty' => $class.'::'.$listener[1],
             );

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Debug/WrappedListener.php

-                      r1041126
+                      r1162441
     private $stoppedPropagation;
     private $stopwatch;
+    private $dispatcher;
     public function __construct($listener, $name, Stopwatch $stopwatch)
+    public function __construct($listener, $name, Stopwatch $stopwatch, EventDispatcherInterface $dispatcher = null)
+    {
         $this->listener = $listener;
         $this->name = $name;
         $this->stopwatch = $stopwatch;
+        $this->dispatcher = $dispatcher;
         $this->called = false;
         $this->stoppedPropagation = false;
 …
         $e = $this->stopwatch->start($this->name, 'event_listener');
         call_user_func($this->listener, $event, $eventName, $dispatcher);
+        call_user_func($this->listener, $event, $eventName, $this->dispatcher ?: $dispatcher);
         if ($e->isStarted()) {

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php

-                      r1041126
+                      r1162441
+            }
+            if ($def->isAbstract()) {
+                throw new \InvalidArgumentException(sprintf('The service "%s" must not be abstract as event subscribers are lazy-loaded.', $id));
+            }
             // We must assume that the class value has been correctly filled, even if the service is created by a factory
             $class = $def->getClass();
+            $class = $container->getParameterBag()->resolveValue($def->getClass());
             $refClass = new \ReflectionClass($class);

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Event.php

-                      r1041126
+                      r1162441
  * further listeners in your event listener.
+ *
  * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
  * @author  Jonathan Wage <jonwage@gmail.com>
  * @author  Roman Borschel <roman@code-factory.org>
  * @author  Bernhard Schussek <bschussek@gmail.com>
+ * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author Jonathan Wage <jonwage@gmail.com>
+ * @author Roman Borschel <roman@code-factory.org>
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ *
  * @api
 …
+{
     /**
      * @var bool    Whether no further event listeners should be triggered
+     * @var bool Whether no further event listeners should be triggered
      */
     private $propagationStopped = false;
 …
      * Returns whether further event listeners should be triggered.
+     *
+     * @see Event::stopPropagation
+     * @return bool    Whether propagation was already stopped for this event.
+     * @see Event::stopPropagation()
+     *
+     * @return bool Whether propagation was already stopped for this event.
+     *
      * @api
 …
     /**
      * Stores the EventDispatcher that dispatches this Event
+     * Stores the EventDispatcher that dispatches this Event.
+     *
      * @param EventDispatcherInterface $dispatcher
 …
     /**
      * Returns the EventDispatcher that dispatches this Event
+     * Returns the EventDispatcher that dispatches this Event.
+     *
      * @return EventDispatcherInterface

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcher.php

-                      r1041126
+                      r1162441
  * manager.
+ *
  * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
  * @author  Jonathan Wage <jonwage@gmail.com>
  * @author  Roman Borschel <roman@code-factory.org>
  * @author  Bernhard Schussek <bschussek@gmail.com>
  * @author  Fabien Potencier <fabien@symfony.com>
  * @author  Jordi Boggiano <j.boggiano@seld.be>
  * @author  Jordan Alliot <jordan.alliot@gmail.com>
+ * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author Jonathan Wage <jonwage@gmail.com>
+ * @author Roman Borschel <roman@code-factory.org>
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @author Jordan Alliot <jordan.alliot@gmail.com>
+ *
  * @api
 …
     /**
      * @see EventDispatcherInterface::dispatch
+     * @see EventDispatcherInterface::dispatch()
+     *
      * @api
 …
     /**
      * @see EventDispatcherInterface::getListeners
+     * @see EventDispatcherInterface::getListeners()
      */
     public function getListeners($eventName = null)
 …
+        }
         foreach (array_keys($this->listeners) as $eventName) {
+        foreach ($this->listeners as $eventName => $eventListeners) {
             if (!isset($this->sorted[$eventName])) {
                 $this->sortListeners($eventName);
 …
     /**
      * @see EventDispatcherInterface::hasListeners
+     * @see EventDispatcherInterface::hasListeners()
      */
     public function hasListeners($eventName = null)
 …
     /**
      * @see EventDispatcherInterface::addListener
+     * @see EventDispatcherInterface::addListener()
+     *
      * @api
 …
     /**
      * @see EventDispatcherInterface::removeListener
+     * @see EventDispatcherInterface::removeListener()
      */
     public function removeListener($eventName, $listener)
 …
     /**
      * @see EventDispatcherInterface::addSubscriber
+     * @see EventDispatcherInterface::addSubscriber()
+     *
      * @api
 …
     /**
      * @see EventDispatcherInterface::removeSubscriber
+     * @see EventDispatcherInterface::removeSubscriber()
      */
     public function removeSubscriber(EventSubscriberInterface $subscriber)

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcherInterface.php

-                      r1041126
+                      r1162441
      *                          the event is the name of the method that is
      *                          invoked on listeners.
      * @param Event $event The event to pass to the event handlers/listeners.
+     * @param Event  $event     The event to pass to the event handlers/listeners.
      *                          If not supplied, an empty Event instance is created.
+     *
 …
      * Removes an event listener from the specified events.
+     *
      * @param string|array $eventName The event(s) to remove a listener from
      * @param callable     $listener  The listener to remove
+     * @param string   $eventName The event to remove a listener from
+     * @param callable $listener  The listener to remove
      */
     public function removeListener($eventName, $listener);
 …
     /**
      * Gets the listeners of a specific event or all listeners.
+     * Gets the listeners of a specific event or all listeners sorted by descending priority.
+     *
      * @param string $eventName The name of the event
 …
      * @param string $eventName The name of the event
+     *
      * @return bool    true if the specified event has any listeners, false otherwise
+     * @return bool true if the specified event has any listeners, false otherwise
      */
     public function hasListeners($eventName = null);

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventSubscriberInterface.php

-                      r1041126
+                      r1162441
  * returned events.
+ *
  * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
  * @author  Jonathan Wage <jonwage@gmail.com>
  * @author  Roman Borschel <roman@code-factory.org>
  * @author  Bernhard Schussek <bschussek@gmail.com>
+ * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author Jonathan Wage <jonwage@gmail.com>
+ * @author Roman Borschel <roman@code-factory.org>
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ *
  * @api

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/GenericEvent.php

r1041126	r1162441
176	176
177	177	/**
178		* IteratorAggregate for iterating over the object like an array
	178	* IteratorAggregate for iterating over the object like an array.
179	179	*
180	180	* @return \ArrayIterator

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php

r1041126	r1162441
21	21	/**
22	22	* The proxied dispatcher.
	23	*
23	24	* @var EventDispatcherInterface
24	25	*/

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/LICENSE

r1041126	r1162441
1		Copyright (c) 2004-2014 Fabien Potencier
	1	Copyright (c) 2004-2015 Fabien Potencier
2	2
3	3	Permission is hereby granted, free of charge, to any person obtaining a copy

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/README.md

-                      r1041126
+                      r1162441
 =========================
 The Symfony2 EventDispatcher component implements the Mediator pattern in a
+The Symfony EventDispatcher component implements the Mediator pattern in a
 simple and effective way to make your projects truly extensible.
+    use Symfony\Component\EventDispatcher\EventDispatcher;
+    use Symfony\Component\EventDispatcher\Event;
+```php
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\Event;
     $dispatcher = new EventDispatcher();
+$dispatcher = new EventDispatcher();
     $dispatcher->addListener('event_name', function (Event $event) {
         // ...
     });
+$dispatcher->addListener('event_name', function (Event $event) {
+    // ...
+});
+    $dispatcher->dispatch('event_name');
+$dispatcher->dispatch('event_name');
+```
 Resources
 …
     $ cd path/to/Symfony/Component/EventDispatcher/
     $ composer.phar install
+    $ composer install
     $ phpunit

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json

-                      r1041126
+                      r1162441
     "description": "Symfony EventDispatcher Component",
     "keywords": [],
     "homepage": "http://symfony.com",
+    "homepage": "https://symfony.com",
     "license": "MIT",
     "authors": [
 …
+        {
             "name": "Symfony Community",
             "homepage": "http://symfony.com/contributors"
+            "homepage": "https://symfony.com/contributors"
+        }
     ],
 …
     },
     "require-dev": {
+        "symfony/dependency-injection": "~2.0,<2.6.0",
+        "symfony/config": "~2.0",
+        "symfony/stopwatch": "~2.2",
+        "symfony/phpunit-bridge": "~2.7",
+        "symfony/dependency-injection": "~2.6",
+        "symfony/expression-language": "~2.6",
+        "symfony/config": "~2.0,>=2.0.5",
+        "symfony/stopwatch": "~2.3",
         "psr/log": "~1.0"
     },
 …
     "extra": {
         "branch-alias": {
             "dev-master": "2.5-dev"
+            "dev-master": "2.6-dev"
+        }
+    }

geoswitch/trunk/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist

-                      r1041126
+                      r1162441
          bootstrap="vendor/autoload.php"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
     <testsuites>
         <testsuite name="Symfony EventDispatcher Component Test Suite">

Context Navigation

Legend:

Download in other formats: