Skip to content

Commit

Permalink
Bump to version 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-grekas committed Dec 15, 2015
1 parent 25a55c6 commit ea2739a
Show file tree
Hide file tree
Showing 61 changed files with 872 additions and 704 deletions.
2 changes: 2 additions & 0 deletions .gitignore
@@ -0,0 +1,2 @@
/composer.lock
/vendor
7 changes: 5 additions & 2 deletions .travis.yml
Expand Up @@ -7,12 +7,15 @@ php:
- 5.4
- 5.5
- 5.6
- nightly
- 7.0
- hhvm

install:
- composer update

script:
- phpunit --coverage-text
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi;
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi;
- phpunit --group unicode

branches:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,11 @@
## v1.3.0 (2015-12-15)

- add shim for mb_convert_variables
- marked all shims as @internal
- test on appveyor
- a few fixes in iconv and mbstring shims
- cleanup refacto for preparing v2 based on symfony-polyfill

## v1.2.5 (2015-10-14)

- handle the third argument of mb_convert_encoding() being an array
Expand Down
39 changes: 39 additions & 0 deletions appveyor.yml
@@ -0,0 +1,39 @@
build: false
platform: x86
clone_folder: c:\projects\utf8

cache:
- c:\php -> appveyor.yml

branches:
only:
- master

init:
- SET PATH=c:\php;%PATH%
- SET COMPOSER_NO_INTERACTION=1
- SET PHP=1

install:
- IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
- cd c:\php
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-5.5.9-nts-Win32-VC11-x86.zip
- IF %PHP%==1 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul
- IF %PHP%==1 del /Q *.zip
- IF %PHP%==1 appveyor DownloadFile https://phar.phpunit.de/phpunit-4.8.15.phar
- IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
- IF %PHP%==1 echo @php %%~dp0phpunit-4.8.15.phar %%* > phpunit.bat
- IF %PHP%==1 copy /Y php.ini-development php.ini
- IF %PHP%==1 echo max_execution_time=1200 >> php.ini
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini
- IF %PHP%==1 echo extension_dir=ext >> php.ini
- IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
- IF %PHP%==1 echo extension=php_intl.dll >> php.ini
- IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
- appveyor DownloadFile https://getcomposer.org/composer.phar
- cd c:\projects\utf8
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
- composer update --prefer-source --no-progress --ansi

test_script:
- phpunit
5 changes: 4 additions & 1 deletion composer.json
Expand Up @@ -25,9 +25,12 @@
"psr-4": {"Patchwork\\": "src/Patchwork/"},
"classmap": ["src/Normalizer.php"]
},
"autoload-dev": {
"files": ["tests/bootstrap.php"]
},
"extra": {
"branch-alias": {
"dev-master": "1.2-dev"
"dev-master": "1.3-dev"
}
}
}
15 changes: 9 additions & 6 deletions phpunit.xml.dist
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit colors="true"
bootstrap="tests/bootstrap.php"
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="vendor/autoload.php"
>
<php>
<ini name="error_reporting" value="-1" />
</php>

<testsuites>
<testsuite name="Patchwork UTF-8 Test Suite">
<directory>./tests/Patchwork/</directory>
<directory>./tests/php-utf8/</directory>
<directory>./tests/unicode/</directory>
<directory>./tests/</directory>
</testsuite>
</testsuites>

Expand All @@ -17,5 +21,4 @@
<group>unicode</group>
</exclude>
</groups>

</phpunit>
2 changes: 1 addition & 1 deletion src/Normalizer.php
@@ -1,7 +1,7 @@
<?php

/*
* Copyright (C) 2013 Nicolas Grekas - p@tchwork.com
* Copyright (C) 2016 Nicolas Grekas - p@tchwork.com
*
* This library is free software; you can redistribute it and/or modify it
* under the terms of the (at your option):
Expand Down

0 comments on commit ea2739a

Please sign in to comment.