Update to Patchwork/utf8 ~1.1

autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit62842db033d4441fd978715211e15a55::getLoader();
+return ComposerAutoloaderInit9168327d22d7433ae0ba86fd37ecd771::getLoader();

composer.json

@@ -31,6 +31,7 @@
 		"bantu/ini-get-wrapper": "v1.0.1",
 		"natxet/CssMin": "dev-master",
 		"mrclay/minify": "dev-master",
-		"punic/punic": "1.1.0"
+		"punic/punic": "1.1.0",
+		"patchwork/utf8": "~1.1"
 	}
 }

composer/autoload_namespaces.php

@@ -17,7 +17,9 @@
     'Sabre\\CardDAV' => array($vendorDir . '/sabre/dav/lib'),
     'Sabre\\CalDAV' => array($vendorDir . '/sabre/dav/lib'),
     'RandomLib' => array($vendorDir . '/ircmaxell/random-lib/lib'),
+    'Patchwork' => array($vendorDir . '/patchwork/utf8/class'),
     'OpenCloud' => array($vendorDir . '/rackspace/php-opencloud/lib', $vendorDir . '/rackspace/php-opencloud/tests'),
+    'Normalizer' => array($vendorDir . '/patchwork/utf8/class'),
     'Net' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
     'Math' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
     'Guzzle\\Stream' => array($vendorDir . '/guzzle/stream'),

composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit62842db033d4441fd978715211e15a55
+class ComposerAutoloaderInit9168327d22d7433ae0ba86fd37ecd771
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit62842db033d4441fd978715211e15a55', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit9168327d22d7433ae0ba86fd37ecd771', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit62842db033d4441fd978715211e15a55', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit9168327d22d7433ae0ba86fd37ecd771', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         array_push($includePaths, get_include_path());
@@ -46,14 +46,14 @@ public static function getLoader()
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            composerRequire62842db033d4441fd978715211e15a55($file);
+            composerRequire9168327d22d7433ae0ba86fd37ecd771($file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire62842db033d4441fd978715211e15a55($file)
+function composerRequire9168327d22d7433ae0ba86fd37ecd771($file)
 {
     require $file;
 }

composer/installed.json

@@ -954,54 +954,54 @@
             "minify"
         ]
     },
-	{
-		"name": "mrclay/minify",
-		"version": "dev-master",
-		"version_normalized": "9999999-dev",
-		"source": {
-			"type": "git",
-			"url": "https://github.com/mrclay/minify.git",
-			"reference": "bd9a450694cda1b54c43a1784adabe36ad522d89"
-		},
-		"dist": {
-			"type": "zip",
-			"url": "https://api.github.com/repos/mrclay/minify/zipball/bd9a450694cda1b54c43a1784adabe36ad522d89",
-			"reference": "bd9a450694cda1b54c43a1784adabe36ad522d89",
-			"shasum": ""
-		},
-		"require": {
-			"ext-pcre": "*",
-			"php": ">=5.2.1"
-		},
-		"require-dev": {
-			"tubalmartin/cssmin": "~2.4.8"
-		},
-		"suggest": {
-			"tubalmartin/cssmin": "Support minify with CSSMin (YUI PHP port)"
-		},
-		"time": "2014-09-25 11:40:53",
-		"type": "library",
-		"installation-source": "source",
-		"autoload": {
-			"classmap": [
-				"min/lib/"
-			]
-		},
-		"notification-url": "https://packagist.org/downloads/",
-		"license": [
-			"BSD-3-Clause"
-		],
-		"authors": [
-			{
-				"name": "Stephen Clay",
-				"email": "steve@mrclay.org",
-				"role": "Developer"
-			}
-		],
-		"description": "Minify is a PHP5 app that helps you follow several rules for client-side performance. It combines multiple CSS or Javascript files, removes unnecessary whitespace and comments, and serves them with gzip encoding and optimal client-side cache headers",
-		"homepage": "http://code.google.com/p/minify/"
-	},
-	{
+    {
+        "name": "mrclay/minify",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/mrclay/minify.git",
+            "reference": "bd9a450694cda1b54c43a1784adabe36ad522d89"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/mrclay/minify/zipball/bd9a450694cda1b54c43a1784adabe36ad522d89",
+            "reference": "bd9a450694cda1b54c43a1784adabe36ad522d89",
+            "shasum": ""
+        },
+        "require": {
+            "ext-pcre": "*",
+            "php": ">=5.2.1"
+        },
+        "require-dev": {
+            "tubalmartin/cssmin": "~2.4.8"
+        },
+        "suggest": {
+            "tubalmartin/cssmin": "Support minify with CSSMin (YUI PHP port)"
+        },
+        "time": "2014-09-25 11:40:53",
+        "type": "library",
+        "installation-source": "source",
+        "autoload": {
+            "classmap": [
+                "min/lib/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Stephen Clay",
+                "email": "steve@mrclay.org",
+                "role": "Developer"
+            }
+        ],
+        "description": "Minify is a PHP5 app that helps you follow several rules for client-side performance. It combines multiple CSS or Javascript files, removes unnecessary whitespace and comments, and serves them with gzip encoding and optimal client-side cache headers",
+        "homepage": "http://code.google.com/p/minify/"
+    },
+    {
         "name": "punic/punic",
         "version": "1.1.0",
         "version_normalized": "1.1.0.0",
@@ -1068,5 +1068,63 @@
             "translations",
             "unicode"
         ]
+    },
+    {
+        "name": "patchwork/utf8",
+        "version": "v1.1.25",
+        "version_normalized": "1.1.25.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/nicolas-grekas/Patchwork-UTF8.git",
+            "reference": "2d43bd047b120279511d45e76e61c5a9812d9a83"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/2d43bd047b120279511d45e76e61c5a9812d9a83",
+            "reference": "2d43bd047b120279511d45e76e61c5a9812d9a83",
+            "shasum": ""
+        },
+        "require": {
+            "lib-pcre": ">=7.3",
+            "php": ">=5.3.0"
+        },
+        "suggest": {
+            "ext-iconv": "Use iconv for best performance",
+            "ext-intl": "Use Intl for best performance",
+            "ext-mbstring": "Use Mbstring for best performance"
+        },
+        "time": "2014-08-05 08:00:32",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.1-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Patchwork": "class/",
+                "Normalizer": "class/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "(Apache-2.0 or GPL-2.0)"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com",
+                "role": "Developer"
+            }
+        ],
+        "description": "Extensive, portable and performant handling of UTF-8 and grapheme clusters for PHP",
+        "homepage": "https://github.com/nicolas-grekas/Patchwork-UTF8",
+        "keywords": [
+            "i18n",
+            "unicode",
+            "utf-8",
+            "utf8"
+        ]
     }
 ]

patchwork/utf8/.travis.yml

@@ -0,0 +1,12 @@
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm-nightly
+
+script:
+  - phpunit --coverage-text
+  - phpunit --group unicode --coverage-text