瀏覽代碼

Merge branch 'dev'

luolongfei 3 年之前
父節點
當前提交
b412001ca1
共有 100 個文件被更改,包括 9604 次插入6191 次删除
  1. 133 129
      .env.example
  2. 8 6
      README.md
  3. 1 1
      README_EN.md
  4. 21 17
      app/Console/FreeNom.php
  5. 10 10
      app/Console/MigrateEnvFile.php
  6. 29 18
      app/Console/Upgrade.php
  7. 39 6
      app/helpers.php
  8. 5 2
      composer.json
  9. 597 106
      composer.lock
  10. 6 20
      config.php
  11. 10 9
      index.php
  12. 3 3
      libs/Argv.php
  13. 2 2
      libs/Base.php
  14. 1 1
      libs/Connector/MessageGateway.php
  15. 4 1
      libs/Lang.php
  16. 2 2
      libs/Message.php
  17. 13 13
      libs/MessageServices/Bark.php
  18. 21 16
      libs/MessageServices/Mail.php
  19. 13 13
      libs/MessageServices/ServerChan.php
  20. 12 12
      libs/MessageServices/TelegramBot.php
  21. 16 16
      libs/MessageServices/WeChat.php
  22. 155 0
      resources/lang/en.php
  23. 130 5
      resources/lang/zh.php
  24. 380 0
      resources/mail/en/no_renewal_required.html
  25. 370 0
      resources/mail/en/notice.html
  26. 380 0
      resources/mail/en/successful_renewal.html
  27. 12 12
      resources/mail/zh/no_renewal_required.html
  28. 12 12
      resources/mail/zh/notice.html
  29. 12 12
      resources/mail/zh/successful_renewal.html
  30. 10 9
      run
  31. 1 1
      vendor/bramus/ansi-php/.gitignore
  32. 11 11
      vendor/bramus/ansi-php/.travis.yml
  33. 18 18
      vendor/bramus/ansi-php/LICENSE
  34. 26 26
      vendor/bramus/ansi-php/composer.json
  35. 1199 1199
      vendor/bramus/ansi-php/composer.lock
  36. 13 13
      vendor/bramus/ansi-php/phpunit.xml.dist
  37. 390 337
      vendor/bramus/ansi-php/readme.md
  38. 116 111
      vendor/bramus/ansi-php/src/Ansi.php
  39. 13 13
      vendor/bramus/ansi-php/src/ControlFunctions/Backspace.php
  40. 71 71
      vendor/bramus/ansi-php/src/ControlFunctions/Base.php
  41. 13 13
      vendor/bramus/ansi-php/src/ControlFunctions/Bell.php
  42. 13 13
      vendor/bramus/ansi-php/src/ControlFunctions/CarriageReturn.php
  43. 361 361
      vendor/bramus/ansi-php/src/ControlFunctions/Enums/C0.php
  44. 13 13
      vendor/bramus/ansi-php/src/ControlFunctions/Escape.php
  45. 13 13
      vendor/bramus/ansi-php/src/ControlFunctions/LineFeed.php
  46. 13 13
      vendor/bramus/ansi-php/src/ControlFunctions/Tab.php
  47. 105 105
      vendor/bramus/ansi-php/src/ControlSequences/Base.php
  48. 30 30
      vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/Base.php
  49. 31 0
      vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/CUB.php
  50. 31 0
      vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/CUD.php
  51. 31 0
      vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/CUF.php
  52. 32 0
      vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/CUP.php
  53. 31 0
      vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/CUU.php
  54. 31 31
      vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/ED.php
  55. 31 31
      vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/EL.php
  56. 26 26
      vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/Enums/ED.php
  57. 26 26
      vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/Enums/EL.php
  58. 111 49
      vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/Enums/FinalByte.php
  59. 385 385
      vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/Enums/SGR.php
  60. 37 37
      vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/SGR.php
  61. 34 34
      vendor/bramus/ansi-php/src/ControlSequences/Traits/HasFinalByte.php
  62. 52 52
      vendor/bramus/ansi-php/src/ControlSequences/Traits/HasIntermediateBytes.php
  63. 52 52
      vendor/bramus/ansi-php/src/ControlSequences/Traits/HasParameterBytes.php
  64. 74 74
      vendor/bramus/ansi-php/src/Traits/ControlFunctions.php
  65. 35 0
      vendor/bramus/ansi-php/src/Traits/EscapeSequences/CUB.php
  66. 35 0
      vendor/bramus/ansi-php/src/Traits/EscapeSequences/CUD.php
  67. 35 0
      vendor/bramus/ansi-php/src/Traits/EscapeSequences/CUF.php
  68. 36 0
      vendor/bramus/ansi-php/src/Traits/EscapeSequences/CUP.php
  69. 35 0
      vendor/bramus/ansi-php/src/Traits/EscapeSequences/CUU.php
  70. 55 54
      vendor/bramus/ansi-php/src/Traits/EscapeSequences/ED.php
  71. 58 57
      vendor/bramus/ansi-php/src/Traits/EscapeSequences/EL.php
  72. 137 136
      vendor/bramus/ansi-php/src/Traits/EscapeSequences/SGR.php
  73. 61 61
      vendor/bramus/ansi-php/src/Writers/BufferWriter.php
  74. 19 19
      vendor/bramus/ansi-php/src/Writers/FlushableInterface.php
  75. 60 60
      vendor/bramus/ansi-php/src/Writers/ProxyWriter.php
  76. 78 78
      vendor/bramus/ansi-php/src/Writers/StreamWriter.php
  77. 16 16
      vendor/bramus/ansi-php/src/Writers/WriterInterface.php
  78. 44 44
      vendor/bramus/ansi-php/tests/AnsiTest.php
  79. 71 71
      vendor/bramus/ansi-php/tests/ControlFunctionsTest.php
  80. 102 0
      vendor/bramus/ansi-php/tests/EscapeSequenceCUBTest.php
  81. 82 0
      vendor/bramus/ansi-php/tests/EscapeSequenceCUDTest.php
  82. 82 0
      vendor/bramus/ansi-php/tests/EscapeSequenceCUFTest.php
  83. 82 0
      vendor/bramus/ansi-php/tests/EscapeSequenceCUPTest.php
  84. 82 0
      vendor/bramus/ansi-php/tests/EscapeSequenceCUUTest.php
  85. 96 96
      vendor/bramus/ansi-php/tests/EscapeSequenceEDTest.php
  86. 96 96
      vendor/bramus/ansi-php/tests/EscapeSequenceELTest.php
  87. 85 85
      vendor/bramus/ansi-php/tests/EscapeSequenceSGRTest.php
  88. 50 50
      vendor/bramus/ansi-php/tests/EscapeSequenceTest.php
  89. 60 60
      vendor/bramus/ansi-php/tests/EscapeSequenceWithParameterBytesTest.php
  90. 71 71
      vendor/bramus/ansi-php/tests/WritersTest.php
  91. 10 10
      vendor/bramus/ansi-php/tests/bootstrap.php
  92. 1 1
      vendor/composer/autoload_files.php
  93. 2 1
      vendor/composer/autoload_psr4.php
  94. 0 2
      vendor/composer/autoload_real.php
  95. 8 2
      vendor/composer/autoload_static.php
  96. 515 104
      vendor/composer/installed.json
  97. 74 35
      vendor/composer/installed.php
  98. 0 26
      vendor/composer/platform_check.php
  99. 0 23
      vendor/guzzlehttp/guzzle/.php_cs
  100. 1490 1322
      vendor/guzzlehttp/guzzle/CHANGELOG.md

+ 133 - 129
.env.example

@@ -1,129 +1,133 @@
-#####################################################################
-# 注意事项
-#
-# - 环境变量的格式为“键=值”,顶格写,注意等号两边不能有空格,值可以用单引号或者双引号引起来,不引也行(下面的特殊情况必须引起来)
-# - 因为环境变量中“#”代表注释,若密码中存在“#”字符的,一定要使用单引号将整个密码引起来,否则解析会在“#”字符前截止,如果密码中存在单双引号的,
-#    需要在单双引号前加“\”转义
-# - 配置多账户不可省略单引号,且多个账户和密码的格式必须是“<账户1>@<密码1>|<账户2>@<密码2>|<账户3>@<密码3>”,不要有空格,就算有程序也会给你干掉
-#    e.g. MULTIPLE_ACCOUNTS='<账户1>@<密码1>|<账户2>@<密码2>|<账户3>@<密码3>'
-#    注意不要省略“<>”符号,否则无法正确匹配
-# - 若你只有单个账户,只配置FREENOM_USERNAME和FREENOM_PASSWORD就够了
-# - 单账户和多账户的配置会被合并在一起读取并去重
-#####################################################################
-
-# .env 文件版本
-ENV_FILE_VERSION='v2'
-
-######################  账户配置 Account config  #########################
-# Freenom 账户 Freenom Account
[email protected]
-
-# Freenom 密码 Freenom password
-FREENOM_PASSWORD=''
-
-# 多账户支持 Support for multiple accounts
-MULTIPLE_ACCOUNTS=''
-
-# Freenom 代理 e.g. http://127.0.0.1:1081 or socks5://127.0.0.1:1080
-FREENOM_PROXY=''
-######################  end 账户配置  #########################
-
-######################  通知邮件配置 Email config  #########################
-# 机器人邮箱账户 Email of robot
[email protected]
-
-# 机器人邮箱密码(Gmail填密码,QQ邮箱或163邮箱填授权码) Password of the robot email
-MAIL_PASSWORD=''
-
-# 用于接收通知的邮箱 Email address used to receive notifications
-TO=''
-
-# 是否启用邮件推送功能 1:启用 0:不启用 Whether to enable email push features 1: enabled 0: not enabled
-MAIL_ENABLE=1
-
-# 自定义邮箱配置 Custom email config
-# 如果你想使用除 “QQ邮箱、163邮箱、Gmail、Outlook邮箱” 外的第三方邮箱或者自建邮箱服务作为机器人邮箱,可以自定义邮箱配置,否则请不要配置这些项
-# If you want to use third-party mailboxes or self-built mailbox services other than "QQ mailbox, 163 mailbox, Gmail, Outlook mailbox" as robot mailbox, you can customize mailbox configuration, otherwise, please don't configure these items.
-
-# SMTP 服务器 SMTP server
-MAIL_HOST=''
-
-# SMTP 端口号 SMTP port
-MAIL_PORT=''
-
-# 邮件加密方式 Email encryption method
-MAIL_ENCRYPTION=''
-
-# end 自定义邮箱配置 Custom email config
-
-######################  end 通知邮件配置  #########################
-
-######################  Telegram bot  #########################
-# 可选配置,通过 Telegram bot 发送通知消息 This is an optional configuration to send notification messages via Telegram bot
-
-# 你的chat_id,通过发送“/start”给@userinfobot可以获取自己的id Your chat_id, you can get your own id by sending "/start" to @userinfobot
-TELEGRAM_CHAT_ID=''
-
-# 你的Telegram bot的token Token for your Telegram bot
-TELEGRAM_BOT_TOKEN=''
-
-# Telegram 代理 e.g. http://127.0.0.1:1081 or socks5://127.0.0.1:1080
-TELEGRAM_PROXY=''
-
-# 是否启用 Telegram Bot 功能 1:启用 0:不启用 Whether to enable Telegram Bot features 1: enabled 0: not enabled
-TELEGRAM_BOT_ENABLE=0
-######################  end Telegram bot  #########################
-
-######################  企业微信  #########################
-# 企业 ID Corporate ID
-WECHAT_CORP_ID=''
-
-# 应用的凭证密钥 Credential keys for enterprise WeChat applications
-WECHAT_CORP_SECRET=''
-
-# 应用 ID
-WECHAT_AGENT_ID=''
-
-# 是否启用企业微信送信功能 1:启用 0:不启用 Whether to enable the enterprise WeChat message push function 1: Enable 0: Do not enable
-WECHAT_ENABLE=0
-######################  end 企业微信  #########################
-
-######################  Server 酱  #########################
-# Server 酱的 SendKey
-SCT_SEND_KEY=''
-
-# 是否启用 Server 酱 送信功能 1:启用 0:不启用 Whether to enable the ServerChan message function 1: enabled 0: not enabled
-SCT_ENABLE=0
-######################  end Server 酱  #########################
-
-######################  Bark 送信  #########################
-# Bark key 打开 Bark App,注册设备后看到的 key Open the Bark App, register the device and see the key
-# 支持直接粘贴 “https://api.day.app/xxx/这里改成你自己的推送内容” 这类文本,程序会自动从中提取有效的 Bark key Support direct paste "https://api.day.app/xxx/这里改成你自己的推送内容" type of text, the program will automatically extract the valid Bark key from it
-BARK_KEY=''
-
-# Bark 域名 默认是 Bark 作者提供的服务,建议自建 The Bark URL defaults to the server provided by the Bark author, and it is recommended to build your own
-BARK_URL='https://api.day.app'
-
-# Bark 其它相关参数(保持默认即可)
-BARK_IS_ARCHIVE=''
-BARK_GROUP='FreeNom'
-BARK_LEVEL='active'
-BARK_ICON='https://q2.qlogo.cn/headimg_dl?dst_uin=593198779&spec=100'
-BARK_JUMP_URL=''
-BARK_SOUND='gotosleep'
-
-# 是否启用 Bark 推送消息 1:启用 0:不启用 Whether to enable Bark push messaging 1: Enable 0: Do not enable
-BARK_ENABLE=0
-######################  end Bark 送信  #########################
-
-# 通知频率 0:仅当有续期操作的时候 1:每次执行 Notification frequency 0: Only when there is a renewal operation 1: Each execution
-NOTICE_FREQ=1
-
-# 是否验证服务器证书 1:验证 0:不验证 Whether to verify the server certificate 1: verify 0: no verification
-VERIFY_SSL=0
-
-# 是否开启 Debug 模式 1:开启 0:关闭 Whether to turn on Debug mode 1: On 0: Off
-DEBUG=0
-
-# 检测是否有新版本可用,发现新版本时推送消息通知 1:开启 0:关闭 Automatically detects if a new version is available and pushes a message notification when a new version is found 1: On 0: Off
-NEW_VERSION_DETECTION=1
+#####################################################################
+# 注意事项
+#
+# - 环境变量的格式为“键=值”,顶格写,注意等号两边不能有空格,值可以用单引号或者双引号引起来,不引也行(下面的特殊情况必须引起来)
+# - 因为环境变量中“#”代表注释,若密码中存在“#”字符的,一定要使用单引号将整个密码引起来,否则解析会在“#”字符前截止,如果密码中存在单双引号的,
+#    需要在单双引号前加“\”转义
+# - 配置多账户不可省略单引号,且多个账户和密码的格式必须是“<账户1>@<密码1>|<账户2>@<密码2>|<账户3>@<密码3>”,不要有空格,就算有程序也会给你干掉
+#    e.g. MULTIPLE_ACCOUNTS='<账户1>@<密码1>|<账户2>@<密码2>|<账户3>@<密码3>'
+#    注意不要省略“<>”符号,否则无法正确匹配
+# - 若你只有单个账户,只配置 FREENOM_USERNAME 和FREENOM_PASSWORD 就够了
+# - 单账户和多账户的配置会被合并在一起读取并去重
+#####################################################################
+
+# .env 文件版本
+ENV_FILE_VERSION='v2.2'
+
+######################  账户配置 Account config  #########################
+# Freenom 账户 Freenom Account
[email protected]
+
+# Freenom 密码 Freenom password
+FREENOM_PASSWORD=''
+
+# 多账户支持 Support for multiple accounts
+MULTIPLE_ACCOUNTS=''
+
+# Freenom 代理 e.g. http://127.0.0.1:1081 or socks5://127.0.0.1:1080
+FREENOM_PROXY=''
+######################  end 账户配置  #########################
+
+######################  通知邮件配置 Email config  #########################
+# 机器人邮箱账户 Email of robot
[email protected]
+
+# 机器人邮箱密码(Gmail填密码,QQ邮箱或163邮箱填授权码) Password of the robot email
+MAIL_PASSWORD=''
+
+# 用于接收通知的邮箱 Email address used to receive notifications
+TO=''
+
+# 是否启用邮件推送功能 1:启用 0:不启用 Whether to enable email push features 1: enabled 0: not enabled
+MAIL_ENABLE=1
+
+# 自定义邮箱配置 Custom email config
+# 如果你想使用除 “QQ邮箱、163邮箱、Gmail、Outlook邮箱” 外的第三方邮箱或者自建邮箱服务作为机器人邮箱,可以自定义邮箱配置,否则请不要配置这些项
+# If you want to use third-party mailboxes or self-built mailbox services other than "QQ mailbox, 163 mailbox, Gmail,
+# Outlook mailbox" as robot mailbox, you can customize mailbox configuration, otherwise, please don't configure these items.
+
+# SMTP 服务器 SMTP server e.g. smtp.gmail.com
+MAIL_HOST=''
+
+# SMTP 端口号,一般是 587 或者 465 SMTP port
+MAIL_PORT=''
+
+# 邮件加密方式,一般是 tls 或者 ssl 或者 starttls Email encryption method
+MAIL_ENCRYPTION=''
+
+# end 自定义邮箱配置 end of custom email config
+
+######################  end 通知邮件配置  #########################
+
+######################  Telegram bot  #########################
+# 可选配置,通过 Telegram bot 发送通知消息 This is an optional configuration to send notification messages via Telegram bot
+
+# 你的chat_id,通过发送“/start”给@userinfobot可以获取自己的id Your chat_id, you can get your own id by sending "/start" to @userinfobot
+TELEGRAM_CHAT_ID=''
+
+# 你的Telegram bot的token Token for your Telegram bot
+TELEGRAM_BOT_TOKEN=''
+
+# Telegram 代理 e.g. http://127.0.0.1:1081 or socks5://127.0.0.1:1080
+TELEGRAM_PROXY=''
+
+# 是否启用 Telegram Bot 功能 1:启用 0:不启用 Whether to enable Telegram Bot features 1: enabled 0: not enabled
+TELEGRAM_BOT_ENABLE=0
+######################  end Telegram bot  #########################
+
+######################  企业微信  #########################
+# 企业 ID Corporate ID
+WECHAT_CORP_ID=''
+
+# 应用的凭证密钥 Credential keys for enterprise WeChat applications
+WECHAT_CORP_SECRET=''
+
+# 应用 ID
+WECHAT_AGENT_ID=''
+
+# 是否启用企业微信送信功能 1:启用 0:不启用 Whether to enable the enterprise WeChat message push function 1: Enable 0: Do not enable
+WECHAT_ENABLE=0
+######################  end 企业微信  #########################
+
+######################  Server 酱  #########################
+# Server 酱的 SendKey
+SCT_SEND_KEY=''
+
+# 是否启用 Server 酱 送信功能 1:启用 0:不启用 Whether to enable the ServerChan message function 1: enabled 0: not enabled
+SCT_ENABLE=0
+######################  end Server 酱  #########################
+
+######################  Bark 送信  #########################
+# Bark key 打开 Bark App,注册设备后看到的 key Open the Bark App, register the device and see the key
+# 支持直接粘贴 “https://api.day.app/xxx/这里改成你自己的推送内容” 这类文本,程序会自动从中提取有效的 Bark key Support direct paste "https://api.day.app/xxx/这里改成你自己的推送内容" type of text, the program will automatically extract the valid Bark key from it
+BARK_KEY=''
+
+# Bark 域名 默认是 Bark 作者提供的服务,建议自建 The Bark URL defaults to the server provided by the Bark author, and it is recommended to build your own
+BARK_URL='https://api.day.app'
+
+# Bark 其它相关参数(保持默认即可)
+BARK_IS_ARCHIVE=''
+BARK_GROUP='FreeNom'
+BARK_LEVEL='active'
+BARK_ICON='https://q2.qlogo.cn/headimg_dl?dst_uin=593198779&spec=100'
+BARK_JUMP_URL=''
+BARK_SOUND='gotosleep'
+
+# 是否启用 Bark 推送消息 1:启用 0:不启用 Whether to enable Bark push messaging 1: Enable 0: Do not enable
+BARK_ENABLE=0
+######################  end Bark 送信  #########################
+
+# 通知频率 0:仅当有续期操作的时候 1:每次执行 Notification frequency 0: Only when there is a renewal operation 1: Each execution
+NOTICE_FREQ=1
+
+# 是否验证服务器证书 1:验证 0:不验证 Whether to verify the server certificate 1: verify 0: no verification
+VERIFY_SSL=0
+
+# 是否开启 Debug 模式 1:开启 0:关闭 Whether to turn on Debug mode 1: On 0: Off
+DEBUG=0
+
+# 检测是否有新版本可用,发现新版本时推送消息通知 1:开启 0:关闭 Automatically detects if a new version is available and pushes a message notification when a new version is found 1: On 0: Off
+NEW_VERSION_DETECTION=1
+
+# 应用语言配置 Application language configuration, the supported values are zh or en, zh means Chinese, en means English
+LANGUAGE=zh

+ 8 - 6
README.md

@@ -2,7 +2,7 @@
 <h1>Freenom:freenom域名自动续期</h1>
 
 [![Build Status](https://img.shields.io/badge/build-passed-brightgreen?style=for-the-badge)](https://scrutinizer-ci.com/g/luolongfei/freenom/build-status/master)
-[![Php Version](https://img.shields.io/badge/php-%3E=7.2-brightgreen.svg?style=for-the-badge)](https://secure.php.net/)
+[![Php Version](https://img.shields.io/badge/php-%3E=7.3-brightgreen.svg?style=for-the-badge)](https://secure.php.net/)
 [![Scrutinizer Code Quality](https://img.shields.io/badge/scrutinizer-9.31-brightgreen?style=for-the-badge)](https://scrutinizer-ci.com/g/luolongfei/freenom/?branch=master)
 [![MIT License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=for-the-badge)](https://github.com/luolongfei/freenom/blob/main/LICENSE)
 
@@ -64,7 +64,7 @@ Documentation: [English version](https://github.com/luolongfei/freenom/blob/main
 
 ### 🎁 事前准备
 
-- VPS:随便一台服务器都行,系统推荐`Centos7`或者`Debian`,另外 PHP 版本需在`php7.2`及以上。如果你没有服务器,推荐参考下方文档
+- VPS:随便一台服务器都行,系统推荐`Debian`或者`Centos7`,另外 PHP 版本需在`php7.3`及以上。如果你没有服务器,推荐参考下方文档
   [🕹 通过腾讯云函数部署](#-方式二通过腾讯云函数部署) 或者 [🧊 通过阿里云函数部署](#-方式三通过阿里云函数部署) 。
 - 送信邮箱(可选):为了方便理解又称机器人邮箱,用于发送通知邮件。目前针对`Gmail`、`QQ邮箱`、`163邮箱`以及`Outlook邮箱`,程序会自动判断送信邮箱类型并使用合适的配置。
   如果你使用的是其它第三方邮箱或者自建邮件服务,那么请参考 [.env.example](https://github.com/luolongfei/freenom/blob/main/.env.example)
@@ -78,7 +78,7 @@ Documentation: [English version](https://github.com/luolongfei/freenom/blob/main
 
 此处会分别介绍`邮件送信` / `Telegram Bot` / `企业微信` / `Server 酱` / `Bark`送信方式的配置方法,以及其所需的资料,你可以任选一种送信方式进行配置,直接跳到对应的文档查看即可。 如果你是 IOS
 用户,推荐使用 `Bark`
-送信方式,一切尽在掌握的感觉很好。其它平台的用户根据自己喜好选择可接受的送信方式即可。这里非常不推荐使用`Server 酱`送信,`Server 酱`每日送信条数的限制,以及需要开会员才能直接看到送信内容,否则需要跳到 `Server 酱`
+送信方式,其它平台的用户根据自己喜好选择可接受的送信方式即可。不推荐使用`Server 酱`送信,`Server 酱`每日送信条数的限制,以及需要开会员才能直接看到送信内容,否则需要跳到 `Server 酱`
 网站才能查看内容,都是不推荐的原因。同样的配置完全可以直接使用`企业微信`送信方式,`企业微信`送信直接在普通微信客户端就能看到信件内容。
 
 *快速到文档指定位置:*
@@ -89,7 +89,7 @@ Documentation: [English version](https://github.com/luolongfei/freenom/blob/main
 
 [企业微信](#企业微信)
 
-[Server 酱](#Server-酱)(不推荐)
+[Server 酱](#Server-酱)
 
 [Bark 送信](#Bark-送信)
 
@@ -574,13 +574,13 @@ systemctl restart docker
 [![aliyun13.png](https://s4.ax1x.com/2021/12/14/ovumgs.png)](https://s4.ax1x.com/2021/12/14/ovumgs.png)
 
 > 在阿里云函数如何修改或者新增环境变量呢?
-> 
+>
 请参考下图操作。
 
 [![aliyun14.png](https://s4.ax1x.com/2021/12/14/ovRKQe.png)](https://s4.ax1x.com/2021/12/14/ovRKQe.png)
 
 > 在阿里云函数如何更新代码或者升级代码到最新版本呢?
-> 
+>
 参考下图,上传新的代码包后,阿里云函数编辑器可能会提示你同步代码,点击【是】即可。然后记得点击【部署】并测试。
 
 [![aliyun15.png](https://s4.ax1x.com/2021/12/14/ovW6HA.png)](https://s4.ax1x.com/2021/12/14/ovW6HA.png)
@@ -768,6 +768,8 @@ cd /data/wwwroot/freenom/ && php run
 ##### Changed
 
 - 解决 企业微信 因送信内容过长被截断问题
+- PHP 版本最低要求不低于 7.3
+- 增加英文相关文言,支持中英文切换
 
 #### [v0.4.4](https://github.com/luolongfei/freenom/releases/tag/v0.4.4) - 2021-12-14
 

+ 1 - 1
README_EN.md

@@ -2,7 +2,7 @@
 <h1>Freenom: freenom domain name renews automatically</h1>
 
 [![Build Status](https://img.shields.io/badge/build-passed-brightgreen?style=for-the-badge)](https://scrutinizer-ci.com/g/luolongfei/freenom/build-status/master)
-[![Php Version](https://img.shields.io/badge/php-%3E=7.2-brightgreen.svg?style=for-the-badge)](https://secure.php.net/)
+[![Php Version](https://img.shields.io/badge/php-%3E=7.3-brightgreen.svg?style=for-the-badge)](https://secure.php.net/)
 [![Scrutinizer Code Quality](https://img.shields.io/badge/scrutinizer-9.31-brightgreen?style=for-the-badge)](https://scrutinizer-ci.com/g/luolongfei/freenom/?branch=master)
 [![MIT License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=for-the-badge)](https://github.com/luolongfei/freenom/blob/main/LICENSE)
 

+ 21 - 17
app/Console/FreeNom.php

@@ -18,7 +18,7 @@ use Luolongfei\Libs\Message;
 
 class FreeNom extends Base
 {
-    const VERSION = 'v0.4.4';
+    const VERSION = 'v0.4.5';
 
     const TIMEOUT = 33;
 
@@ -93,7 +93,7 @@ class FreeNom extends Base
             'proxy' => config('freenom_proxy'),
         ]);
 
-        system_log(sprintf('当前程序版本 %s', self::VERSION));
+        system_log(sprintf(lang('100038'), self::VERSION));
     }
 
     private function __clone()
@@ -128,7 +128,7 @@ class FreeNom extends Base
         }
 
         if (empty($this->jar->getCookieByName('WHMCSZH5eHTGhfvzP')->getValue())) {
-            throw new LlfException(34520002, lang('error_msg.100001'));
+            throw new LlfException(34520002, lang('100001'));
         }
 
         return true;
@@ -244,16 +244,16 @@ class FreeNom extends Base
                 'renewalFailuresArr' => $renewalFailuresArr,
                 'domainStatusArr' => $domainStatusArr,
             ];
-            $result = Message::send('', '主人,我刚刚帮你续期域名啦~', 2, $data);
+            $result = Message::send('', lang('100039'), 2, $data);
 
             system_log(sprintf(
-                '恭喜,成功续期 <green>%d</green> 个域名,失败 <green>%d</green> 个域名。%s',
+                lang('100040'),
                 count($renewalSuccessArr),
                 count($renewalFailuresArr),
-                $result ? '详细的续期结果已送信成功,请注意查收。' : ''
+                $result ? lang('100041') : ''
             ));
 
-            Log::info(sprintf("账户:%s\n续期结果如下:\n", $this->username), $data);
+            Log::info(sprintf(lang('100042'), $this->username), $data);
 
             return true;
         }
@@ -264,12 +264,12 @@ class FreeNom extends Base
                 'username' => $this->username,
                 'domainStatusArr' => $domainStatusArr,
             ];
-            Message::send('', '报告,今天没有域名需要续期', 3, $data);
+            Message::send('', lang('100043'), 3, $data);
         } else {
-            system_log('当前通知频率为「仅当有续期操作时」,故本次不会推送通知');
+            system_log(lang('100044'));
         }
 
-        system_log(sprintf('%s:<green>执行成功,今次没有需要续期的域名。</green>', $this->username));
+        system_log(sprintf(lang('100045'), $this->username));
 
         return true;
     }
@@ -303,7 +303,7 @@ class FreeNom extends Base
 
             return stripos($resp, 'Order Confirmation') !== false;
         } catch (\Exception $e) {
-            $errorMsg = sprintf('续期请求出错:%s,域名 ID:%s(账户:%s)', $e->getMessage(), $id, $this->username);
+            $errorMsg = sprintf(lang('100046'), $e->getMessage(), $id, $this->username);
             system_log($errorMsg);
             Message::send($errorMsg);
 
@@ -393,12 +393,12 @@ class FreeNom extends Base
     private function sendExceptionReport($e)
     {
         Message::send(sprintf(
-            '具体是在%s文件的第%d行,抛出了一个异常。异常的内容是%s,快去看看吧。(账户:%s)',
+            lang('100047'),
             $e->getFile(),
             $e->getLine(),
             $e->getMessage(),
             $this->username
-        ), '主人,出错了,' . $e->getMessage());
+        ), lang('100048') . $e->getMessage());
     }
 
     /**
@@ -408,11 +408,15 @@ class FreeNom extends Base
     public function handle()
     {
         $accounts = $this->getAccounts();
+        $totalAccounts = count($accounts);
 
-        system_log(sprintf('共发现 <green>%d</green> 个 freenom 账户,处理中', count($accounts)));
+        system_log(sprintf(lang('100049'), $totalAccounts));
 
-        foreach ($accounts as $account) {
+        foreach ($accounts as $index => $account) {
             try {
+                $num = $index + 1;
+                system_log(sprintf(lang('100050'), get_local_num($num), $num, $totalAccounts));
+
                 $this->username = $account['username'];
                 $this->password = $account['password'];
 
@@ -425,10 +429,10 @@ class FreeNom extends Base
 
                 $this->renewAllDomains($allDomains, $token);
             } catch (LlfException $e) {
-                system_log(sprintf('出错:<red>%s</red>', $e->getMessage()));
+                system_log(sprintf(lang('100051'), $e->getMessage()));
                 $this->sendExceptionReport($e);
             } catch (\Exception $e) {
-                system_log(sprintf('出错:<red>%s</red>', $e->getMessage()), $e->getTrace());
+                system_log(sprintf(lang('100052'), $e->getMessage()), $e->getTrace());
                 $this->sendExceptionReport($e);
             }
         }

+ 10 - 10
app/Console/MigrateEnvFile.php

@@ -118,11 +118,11 @@ class MigrateEnvFile extends Base
         $file = $this->getEnvFilePath($filename);
 
         if (!file_exists($file)) {
-            throw new \Exception('文件不存在:' . $file);
+            throw new \Exception(lang('100021') . $file);
         }
 
         if (($fileContent = file_get_contents($file)) === false) {
-            throw new \Exception('读取文件内容失败:' . $file);
+            throw new \Exception(lang('100022') . $file);
         }
 
         if (!preg_match('/^ENV_FILE_VERSION=(?P<env_file_version>.*?)$/im', $fileContent, $m)) {
@@ -143,7 +143,7 @@ class MigrateEnvFile extends Base
     public function backup()
     {
         if (copy($this->getEnvFilePath(), $this->getEnvFilePath('.env.old')) === false) {
-            throw new \Exception('备份 .env 文件到 .env.old 文件时出错');
+            throw new \Exception(lang('100020'));
         }
 
         return true;
@@ -158,7 +158,7 @@ class MigrateEnvFile extends Base
     public function genNewEnvFile()
     {
         if (copy($this->getEnvFilePath('.env.example'), $this->getEnvFilePath('.env')) === false) {
-            throw new \Exception('从 .env.example 文件生成 .env 文件时出错');
+            throw new \Exception(lang('100019'));
         }
 
         return true;
@@ -239,22 +239,22 @@ class MigrateEnvFile extends Base
                 return true;
             }
 
-            system_log('检测到你的 .env 文件内容过旧,程式将根据 .env.example 文件自动更新相关配置项,不要慌张,此操作对已有数据不会有任何影响');
+            system_log(lang('100013'));
 
             $this->backup();
-            system_log(sprintf('<green>已完成 .env 文件备份</green>,旧文件位置为 %s/.env.old', ROOT_PATH));
+            system_log(sprintf(lang('100014'), ROOT_PATH));
 
             $this->genNewEnvFile();
-            system_log('已生成新 .env 文件');
+            system_log(lang('100015'));
 
             $this->migrateData($this->allOldEnvValues);
-            system_log(sprintf('<green>数据迁移完成</green>,共迁移 %d 条环境变量数据', $this->migrateNum));
+            system_log(sprintf(lang('100016'), $this->migrateNum));
 
-            system_log('<green>恭喜,已成功完成 .env 文件升级</green>');
+            system_log(lang('100017'));
 
             return true;
         } catch (\Exception $e) {
-            system_log('升级 .env 文件出错:' . $e->getMessage());
+            system_log(lang('100018') . $e->getMessage());
 
             return false;
         }

+ 29 - 18
app/Console/Upgrade.php

@@ -58,6 +58,8 @@ class Upgrade extends Base
     {
         $this->pushedVerFile = DATA_PATH . DS . 'pushed_version.txt';
 
+        $this->language = config('language', 'zh');
+
         $this->client = new Client([
             'base_uri' => 'https://api.github.com',
             'headers' => [
@@ -94,7 +96,7 @@ class Upgrade extends Base
                 || !isset($resp['name'])
                 || !isset($resp['published_at'])
                 || !isset($resp['html_url'])) {
-                throw new \Exception('Github 返回的数据与预期不一致:' . json_encode($resp, JSON_UNESCAPED_UNICODE));
+                throw new \Exception(lang('100023') . json_encode($resp, JSON_UNESCAPED_UNICODE));
             }
 
             $this->releaseInfo = $resp;
@@ -104,7 +106,7 @@ class Upgrade extends Base
 
             return version_compare($this->latestVer, $this->currVer, '>');
         } catch (\Exception $e) {
-            Log::error('检测升级出错:' . $e->getMessage());
+            Log::error(lang('100024') . $e->getMessage());
 
             return false;
         }
@@ -147,18 +149,27 @@ class Upgrade extends Base
      */
     public function genMsgContent()
     {
-        $content = sprintf(
-            "见信好,我们在 %s 发布了新版 FreeNom 续期工具 v%s,而你当前正在使用的版本为 v%s,你可以根据自己的实际需要决定是否升级到新版本。今次新版有以下更新或改进:\n\n",
-            $this->friendlyDateFormat($this->releaseInfo['published_at'], 'UTC'),
-            $this->latestVer,
-            $this->currVer
-        );
+        if ($this->language === 'zh') {
+            $content = sprintf(
+                lang('100025'),
+                $this->friendlyDateFormat($this->releaseInfo['published_at'], 'UTC'),
+                $this->latestVer,
+                $this->currVer
+            );
+        } else {
+            $content = sprintf(
+                lang('100025'),
+                $this->latestVer,
+                $this->friendlyDateFormat($this->releaseInfo['published_at'], 'UTC'),
+                $this->currVer
+            );
+        }
 
         $content .= $this->releaseInfo['body'];
 
-        $content .= "\n\n" . '欲知更多信息,请访问:' . $this->releaseInfo['html_url'];
+        $content .= "\n\n" . lang('100026') . $this->releaseInfo['html_url'];
 
-        $content .= "\n\n" . '(本消息针对同一个新版只会推送一次,如果你不想收到新版本通知,将 .env 文件中的 NEW_VERSION_DETECTION 的值设为 0 即可)';
+        $content .= "\n\n" . lang('100027');
 
         return $content;
     }
@@ -181,15 +192,15 @@ class Upgrade extends Base
 
             if ($diff < 86400) {
                 if ($d->format('d') === date('d')) {
-                    return $diff < 60 ? '刚刚' : ($diff < 3600 ? floor($diff / 60) . '分钟前' : floor($diff / 3600) . '小时前');
+                    return $diff < 60 ? lang('100028') : ($diff < 3600 ? floor($diff / 60) . lang('100029') : floor($diff / 3600) . lang('100030'));
                 } else {
-                    return '昨天 ' . $d->format('H:i');
+                    return lang('100031') . $d->format('H:i');
                 }
             } else {
                 return $d->format($d->format('Y') === date('Y') ? 'Y-m-d H:i' : 'Y-m-d');
             }
         } catch (\Exception $e) {
-            Log::error('转人类友好时间出错:' . $e->getMessage());
+            Log::error(lang('100032') . $e->getMessage());
 
             return $date;
         }
@@ -211,34 +222,34 @@ class Upgrade extends Base
 
             if (IS_SCF) {
                 system_log(sprintf(
-                    'FreeNom 续期工具有新的版本可用,你当前版本为 v%s,最新版本为 v%s。关于新版的详细信息,请访问:%s',
+                    lang('100033'),
                     $this->currVer,
                     $this->latestVer,
                     $this->releaseInfo['html_url']
                 ));
             } else {
                 system_log(sprintf(
-                    '<green>FreeNom 续期工具有新的版本可用,最新版本为 v%s(%s)</green>',
+                    lang('100034'),
                     $this->latestVer,
                     $this->releaseInfo['html_url']
                 ));
 
                 $result = Message::send(
                     $this->genMsgContent(),
-                    sprintf('主人,FreeNom 续期工具有新的版本(v%s)可用,新版相关情况已给到你', $this->latestVer),
+                    sprintf(lang('100035'), $this->latestVer),
                     4,
                     $this->releaseInfo
                 );
 
                 if ($result) {
                     $this->rememberVer($this->latestVer);
-                    system_log('有关新版的信息已送信给到你,请注意查收。');
+                    system_log(lang('100036'));
                 }
             }
 
             return true;
         } catch (\Exception $e) {
-            system_log('升级出错:' . $e->getMessage());
+            system_log(lang('100037') . $e->getMessage());
 
             return false;
         }

+ 39 - 6
app/helpers.php

@@ -59,6 +59,8 @@ if (!function_exists('system_log')) {
      * 'light_yellow', 'light_blue', 'light_magenta', 'light_cyan', 'white', 'bg_default', 'bg_black', 'bg_red',
      * 'bg_green', 'bg_yellow', 'bg_blue', 'bg_magenta', 'bg_cyan', 'bg_light_gray', 'bg_dark_gray', 'bg_light_red',
      * 'bg_light_green','bg_light_yellow', 'bg_light_blue', 'bg_light_magenta', 'bg_light_cyan', 'bg_white'
+     *
+     * system_log('<light_magenta>颜色 light_magenta</light_magenta>');
      */
     function system_log($content, array $response = [], $fileName = '')
     {
@@ -230,15 +232,15 @@ if (!function_exists('system_check')) {
      */
     function system_check()
     {
-        if (version_compare(PHP_VERSION, '7.0.0') < 0) {
-            throw new LlfException(34520006);
+        if (version_compare(PHP_VERSION, '7.3.0') < 0) {
+            throw new LlfException(34520006, ['7.3', PHP_VERSION]);
         }
 
         // 如果是在云函数部署,则不需要检查这几项
         if (IS_SCF) {
-            system_log('检测到运行环境为云函数,所有环境变量将直接从环境中读取,环境中找不到的变量,则直接从 .env.example 文件中读取');
-            system_log('如果是在腾讯云函数,可以参考此处修改或新增环境变量,无需重建:https://github.com/luolongfei/freenom/blob/main/resources/screenshot/scf03.png');
-            system_log('如果是在阿里云函数,可以直接在【函数详情】->【函数配置】->【环境信息】处编辑环境变量');
+            system_log(lang('100009'));
+            system_log(lang('100010'));
+            system_log(lang('100011'));
         } else {
             if (!function_exists('putenv')) {
                 throw new LlfException(34520005);
@@ -257,7 +259,7 @@ if (!function_exists('system_check')) {
         if (config('new_version_detection')) {
             Upgrade::getInstance()->handle();
         } else {
-            system_log('由于你没有开启升级提醒功能,故无法在有新版本可用时第一时间收到通知。将 .env 文件中 NEW_VERSION_DETECTION 的值改为 1 即可重新开启相关功能。');
+            system_log(lang('100012'));
         }
 
         if (!extension_loaded('curl')) {
@@ -265,3 +267,34 @@ if (!function_exists('system_check')) {
         }
     }
 }
+
+if (!function_exists('get_local_num')) {
+    /**
+     * 获取当地数字
+     *
+     * @param string|int $num
+     *
+     * @return string
+     */
+    function get_local_num($num)
+    {
+        $num = (string)$num;
+
+        if (\config('language') === 'zh') {
+            return $num;
+        }
+
+        // 英文数字规则
+        $lastDigit = substr($num, -1);
+        switch ($lastDigit) {
+            case '1':
+                return $num . 'st';
+            case '2':
+                return $num . 'nd';
+            case '3':
+                return $num . 'rd';
+            default:
+                return $num . 'th';
+        }
+    }
+}

+ 5 - 2
composer.json

@@ -3,10 +3,10 @@
     "description": "freenom域名自动续期。",
     "type": "project",
     "require": {
-        "php": ">=7.1.0",
+        "php": ">=7.3",
         "ext-curl": "*",
         "ext-openssl": "*",
-        "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/guzzle": "^7.4.1",
         "monolog/monolog": "^1.24",
         "bramus/monolog-colored-line-formatter": "~2.0",
         "phpmailer/phpmailer": "^6.0",
@@ -34,5 +34,8 @@
         "files": [
             "app/helpers.php"
         ]
+    },
+    "config": {
+        "platform-check": false
     }
 }

File diff suppressed because it is too large
+ 597 - 106
composer.lock


+ 6 - 20
config.php

@@ -22,18 +22,14 @@ return [
             'username' => env('MAIL_USERNAME'), // 机器人邮箱账户
             'password' => env('MAIL_PASSWORD'), // 机器人邮箱密码或授权码
             'enable' => (int)env('MAIL_ENABLE'), // 是否启用,默认启用
-
             'not_enabled_tips' => env('MAIL_USERNAME') && env('MAIL_PASSWORD'), // 提醒未启用
-
             // 'reply_to' => '[email protected]', // 接收回复的邮箱
             // 'reply_to_name' => '作者', // 接收回复的人名
-
             'host' => env('MAIL_HOST'), // 邮件 SMTP 服务器
             'port' => env('MAIL_PORT'), // 邮件 SMTP 端口
             'encryption' => env('MAIL_ENCRYPTION'), // 邮件加密方式
-
             'class' => \Luolongfei\Libs\MessageServices\Mail::class,
-            'name' => '邮件',
+            'name' => lang('100064'),
         ],
 
         /**
@@ -43,12 +39,9 @@ return [
             'chat_id' => env('TELEGRAM_CHAT_ID'), // 你的chat_id,通过发送“/start”给@userinfobot可以获取自己的id
             'token' => env('TELEGRAM_BOT_TOKEN'), // Telegram Bot 的 token
             'enable' => (int)env('TELEGRAM_BOT_ENABLE'), // 是否启用,默认不启用
-
             'not_enabled_tips' => env('TELEGRAM_CHAT_ID') && env('TELEGRAM_BOT_TOKEN'), // 提醒未启用
-
             'class' => \Luolongfei\Libs\MessageServices\TelegramBot::class,
-            'name' => 'Telegram Bot',
-
+            'name' => lang('100065'),
             'proxy' => env('TELEGRAM_PROXY'),
         ],
 
@@ -60,11 +53,9 @@ return [
             'corp_secret' => env('WECHAT_CORP_SECRET'), // 企业微信应用的凭证密钥
             'agent_id' => (int)env('WECHAT_AGENT_ID'), // 企业微信应用 ID
             'enable' => (int)env('WECHAT_ENABLE'), // 是否启用,默认不启用
-
             'not_enabled_tips' => env('WECHAT_CORP_ID') && env('WECHAT_CORP_SECRET') && env('WECHAT_AGENT_ID'), // 提醒未启用
-
             'class' => \Luolongfei\Libs\MessageServices\WeChat::class,
-            'name' => '企业微信',
+            'name' => lang('100066'),
         ],
 
         /**
@@ -73,11 +64,9 @@ return [
         'sct' => [
             'sct_send_key' => env('SCT_SEND_KEY'), // SendKey
             'enable' => (int)env('SCT_ENABLE'), // 是否启用,默认不启用
-
             'not_enabled_tips' => (bool)env('SCT_SEND_KEY'), // 提醒未启用
-
             'class' => \Luolongfei\Libs\MessageServices\ServerChan::class,
-            'name' => 'Server 酱',
+            'name' => lang('100067'),
         ],
 
         /**
@@ -93,15 +82,12 @@ return [
             'bark_jump_url' => env('BARK_JUMP_URL') === '' ? null : env('BARK_JUMP_URL'),
             'bark_sound' => env('BARK_SOUND') === '' ? null : env('BARK_SOUND'),
             'enable' => (int)env('BARK_ENABLE'), // 是否启用,默认不启用
-
             'not_enabled_tips' => env('BARK_KEY') && env('BARK_URL'), // 提醒未启用
-
             'class' => \Luolongfei\Libs\MessageServices\Bark::class,
-            'name' => 'Bark',
+            'name' => lang('100068'),
         ],
     ],
-
-    'locale' => 'zh', // 指定语言包,位于resources/lang/目录下
+    'language' => env('LANGUAGE', 'zh'),
     'notice_freq' => (int)env('NOTICE_FREQ', 1), // 通知频率 0:仅当有续期操作的时候 1:每次执行
     'verify_ssl' => (bool)env('VERIFY_SSL', 0), // 请求时验证 SSL 证书行为,默认不验证,防止服务器证书过期或证书颁布者信息不全导致无法发出请求
     'debug' => (bool)env('DEBUG'),

+ 10 - 9
index.php

@@ -49,8 +49,9 @@ use Luolongfei\Libs\Message;
 function customize_error_handler()
 {
     if (!is_null($error = error_get_last())) {
-        Log::error('程序意外终止', $error);
-        Message::send('可能存在错误,这边收集到的错误信息为:' . json_encode($error, JSON_UNESCAPED_UNICODE), '主人,程序意外终止');
+        system_log(json_encode($error, JSON_UNESCAPED_UNICODE));
+        Log::error(lang('100057'), $error);
+        Message::send(lang('100058') . json_encode($error, JSON_UNESCAPED_UNICODE), lang('100059'));
     }
 }
 
@@ -61,8 +62,8 @@ function customize_error_handler()
  */
 function exception_handler($e)
 {
-    Log::error('未捕获的异常:' . $e->getMessage());
-    Message::send("具体的异常内容是:\n" . $e->getMessage(), '主人,未捕获的异常');
+    Log::error(lang('100060') . $e->getMessage());
+    Message::send(lang('100061') . $e->getMessage(), lang('100062'));
 }
 
 /**
@@ -89,7 +90,7 @@ function main_handler($event, $context)
 function handler($event, $context)
 {
     $logger = $GLOBALS['fcLogger'];
-    $logger->info('开始执行阿里云函数');
+    $logger->info(lang('100063'));
 
     return run();
 }
@@ -107,11 +108,11 @@ function run()
 
         $class::getInstance()->$fn();
 
-        return IS_SCF ? '云函数执行成功。' : true;
+        return IS_SCF ? lang('100007') : true;
     } catch (\Exception $e) {
-        system_log(sprintf('执行出错:<red>%s</red>', $e->getMessage()), $e->getTrace());
-        Message::send("执行出错:\n" . $e->getMessage(), '主人,捕获异常');
+        system_log(sprintf(lang('100006'), $e->getMessage()), $e->getTrace());
+        Message::send(lang('100004') . $e->getMessage(), lang('100005'));
     }
 
-    return IS_SCF ? '云函数执行失败。' : false;
+    return IS_SCF ? lang('100008') : false;
 }

+ 3 - 3
libs/Argv.php

@@ -24,9 +24,9 @@ class Argv extends Base
             $desc = <<<FLL
 Description
 Params:
--c: <string> 指定要实例化的类名。默认调用FreeNom类
--m: <string> 指定要调用的方法名(不支持静态方法)。默认调用handle方法
--h: 显示说明
+-c: <string> 指定要实例化的类名。默认调用 FreeNom  Specifies the name of the class to instantiate. The default call to the FreeNom class
+-m: <string> 指定要调用的方法名(不支持静态方法)。默认调用 handle 方法 Specifies the name of the method to be called (static methods are not supported). The handle method is called by default
+-h: 显示说明 Help
 
 Example: 
 $ php run -c=FreeNom -m=handle

+ 2 - 2
libs/Base.php

@@ -25,11 +25,11 @@ class Base
     public static function addInstance(string $className, bool $overwrite = false)
     {
         if (isset(self::$instances[$className]) && !$overwrite) {
-            throw new \InvalidArgumentException(sprintf('类 %s 的实例已存在', $className));
+            throw new \InvalidArgumentException(sprintf(lang('100053'), $className));
         }
 
         if (!class_exists($className)) {
-            throw new \Exception(sprintf('类 %s 不存在', $className));
+            throw new \Exception(sprintf(lang('100054'), $className));
         }
 
         $instance = new $className();

+ 1 - 1
libs/Connector/MessageGateway.php

@@ -35,7 +35,7 @@ abstract class MessageGateway implements MessageServiceInterface
     public function check(string $content, array $data)
     {
         if ($content === '' && empty($data)) {
-            throw new \Exception(lang('error_msg.100002'));
+            throw new \Exception(lang('100002'));
         }
     }
 

+ 4 - 1
libs/Lang.php

@@ -18,7 +18,8 @@ class Lang extends Base
 
     public function init()
     {
-        $this->lang = require sprintf('%s/lang/%s.php', RESOURCES_PATH, config('locale'));
+        // 读取语言包,位于 resources/lang/ 目录下
+        $this->lang = require sprintf('%s/lang/%s.php', RESOURCES_PATH, env('LANGUAGE', 'zh'));
     }
 
     /**
@@ -46,6 +47,8 @@ class Lang extends Base
             } else {
                 if (isset($lang[$key])) {
                     return $lang[$key];
+                } else if (isset($lang['messages'][$key])) { // 如果没有在根节点找到语言数据,则尝试从 messages 下标继续找寻
+                    return $lang['messages'][$key];
                 }
 
                 return null;

+ 2 - 2
libs/Message.php

@@ -35,7 +35,7 @@ abstract class Message extends Base
         foreach (config('message') as $conf) {
             if ($conf['enable'] !== 1) {
                 if ($conf['not_enabled_tips'] && self::$notEnabledTips) { // 仅在存在配置的送信项未启用的情况下提醒
-                    system_log(sprintf('由于没有启用「%s」功能,故本次不通过「%s」送信,尽管检测到相关配置。', $conf['name'], $conf['name']));
+                    system_log(sprintf(lang('100055'), $conf['name'], $conf['name']));
                 }
 
                 continue;
@@ -44,7 +44,7 @@ abstract class Message extends Base
             $serviceInstance = self::getInstance($conf['class'], 'IS_MESSAGE_SERVICE');
 
             if (!$serviceInstance instanceof MessageServiceInterface) {
-                throw new \Exception(sprintf('消息服务类 %s 必须继承并实现 MessageServiceInterface 接口', $conf['class']));
+                throw new \Exception(sprintf(lang('100056'), $conf['class']));
             }
 
             if ($serviceInstance->$method(...$params) && !$result) { // 任一方式送信成功即为成功

+ 13 - 13
libs/MessageServices/Bark.php

@@ -146,8 +146,8 @@ class Bark extends MessageGateway
     {
         $footer = '';
 
-        $footer .= "\n更多信息可以参考:https://my.freenom.com/domains.php?a=renewals(点击“复制内容”即可复制此网址)";
-        $footer .= "\n\n(如果你不想每次执行都收到推送,请将 .env 中 NOTICE_FREQ 的值设为 0,使程序只在有续期操作时才推送)";
+        $footer .= lang('100078');
+        $footer .= lang('100079');
 
         return $footer;
     }
@@ -162,16 +162,16 @@ class Bark extends MessageGateway
     public function genDomainStatusText(array $domainStatus)
     {
         if (empty($domainStatus)) {
-            return "无数据。\n";
+            return lang('100080');
         }
 
         $domainStatusText = '';
 
         foreach ($domainStatus as $domain => $daysLeft) {
-            $domainStatusText .= sprintf('%s 还有 %d 天到期,', $domain, $daysLeft);
+            $domainStatusText .= sprintf(lang('100081'), $domain, $daysLeft);
         }
 
-        $domainStatusText = rtrim($domainStatusText, ',') . "。\n";
+        $domainStatusText = rtrim(rtrim($domainStatusText, ' '), ',,') . lang('100082');
 
         return $domainStatusText;
     }
@@ -188,19 +188,19 @@ class Bark extends MessageGateway
      */
     public function genDomainRenewalResultsText(string $username, array $renewalSuccessArr, array $renewalFailuresArr, array $domainStatus)
     {
-        $text = sprintf("账户 %s 这次续期的结果如下\n\n", $username);
+        $text = sprintf(lang('100083'), $username);
 
         if ($renewalSuccessArr) {
-            $text .= '续期成功:';
+            $text .= lang('100084');
             $text .= $this->genDomainsText($renewalSuccessArr);
         }
 
         if ($renewalFailuresArr) {
-            $text .= '续期出错:';
+            $text .= lang('100085');
             $text .= $this->genDomainsText($renewalFailuresArr);
         }
 
-        $text .= "\n今次无需续期的域名及其剩余天数如下所示:\n\n";
+        $text .= lang('100086');
         $text .= $this->genDomainStatusText($domainStatus);
 
         $text .= $this->getFooter();
@@ -218,7 +218,7 @@ class Bark extends MessageGateway
      */
     public function genDomainStatusFullText(string $username, array $domainStatus)
     {
-        $markDownText = sprintf("我刚刚帮小主看了一下,账户 %s 今天并没有需要续期的域名。所有域名情况如下:\n\n", $username);
+        $markDownText = sprintf(lang('100087'), $username);
 
         $markDownText .= $this->genDomainStatusText($domainStatus);
 
@@ -251,7 +251,7 @@ class Bark extends MessageGateway
         } else if ($type === 3) {
             $content = $this->genDomainStatusFullText($data['username'], $data['domainStatusArr']);
         } else {
-            throw new \Exception(lang('error_msg.100003'));
+            throw new \Exception(lang('100003'));
         }
 
         $query = [
@@ -302,9 +302,9 @@ class Bark extends MessageGateway
                 return true;
             }
 
-            throw new \Exception($resp['message'] ?? '未知原因');
+            throw new \Exception($resp['message'] ?? lang('100088'));
         } catch (\Exception $e) {
-            system_log('Bark 送信失败:<red>' . $e->getMessage() . '</red>');
+            system_log(sprintf(lang('100089'), $e->getMessage()));
 
             return false;
         }

+ 21 - 16
libs/MessageServices/Mail.php

@@ -27,6 +27,12 @@ class Mail extends MessageGateway
      */
     public function __construct()
     {
+        $this->language = config('language', 'zh');
+
+        $this->noticeTemplatePath = sprintf('%s/mail/%s/notice.html', RESOURCES_PATH, $this->language);
+        $this->successfulRenewalTemplatePath = sprintf('%s/mail/%s/successful_renewal.html', RESOURCES_PATH, $this->language);
+        $this->noRenewalRequiredTemplatePath = sprintf('%s/mail/%s/no_renewal_required.html', RESOURCES_PATH, $this->language);
+
         $this->phpMailerInstance = new PHPMailer(true);
 
         $this->init();
@@ -92,8 +98,7 @@ class Mail extends MessageGateway
             $secure = config('message.mail.encryption');
             $port = (int)config('message.mail.port');
             if (!($host && $secure && $port)) {
-                throw new MailException('目前支持Gmail、QQ邮箱、163邮箱以及Outlook邮箱自动识别配置,其它类型的邮箱或者自建邮箱,'
-                    . '请在 .env 文件中追加“自定义邮箱配置”的所有相关项,否则无法使用邮件服务。');
+                throw new MailException(lang('100069'));
             }
         }
 
@@ -128,16 +133,16 @@ class Mail extends MessageGateway
     public function genDomainStatusHtml(array $domainStatus)
     {
         if (empty($domainStatus)) {
-            return "无数据。";
+            return lang('100070');
         }
 
         $domainStatusHtml = '';
 
         foreach ($domainStatus as $domain => $daysLeft) {
-            $domainStatusHtml .= sprintf('<a href="http://%s" rel="noopener" target="_blank">%s</a>还有 <span style="font-weight: bold; font-size: 16px;">%d</span> 天到期,', $domain, $domain, $daysLeft);
+            $domainStatusHtml .= sprintf(lang('100071'), $domain, $domain, $daysLeft);
         }
 
-        $domainStatusHtml = rtrim($domainStatusHtml, ',') . "。";
+        $domainStatusHtml = rtrim(rtrim($domainStatusHtml, ' '), ',,') . lang('100072');
 
         return $domainStatusHtml;
     }
@@ -166,8 +171,8 @@ class Mail extends MessageGateway
 
         $this->check($content, $data);
 
-        $this->phpMailerInstance->addAddress($recipient, config('message.mail.recipient_name', '主人')); // 添加收件人,参数2选填
-        $this->phpMailerInstance->addReplyTo(config('message.mail.reply_to', '[email protected]'), config('message.mail.reply_to_name', '作者')); // 备用回复地址,收到的回复的邮件将被发到此地址
+        $this->phpMailerInstance->addAddress($recipient, config('message.mail.recipient_name', lang('100073'))); // 添加收件人,参数2选填
+        $this->phpMailerInstance->addReplyTo(config('message.mail.reply_to', '[email protected]'), config('message.mail.reply_to_name', lang('100074'))); // 备用回复地址,收到的回复的邮件将被发到此地址
 
         /**
          * 抄送和密送都是添加收件人,抄送方式下,被抄送者知道除被密送者外的所有的收件人,密送方式下,
@@ -195,32 +200,32 @@ class Mail extends MessageGateway
          * $this->phpMailerInstance->AltBody = 'This is an HTML-only message. To view it, activate HTML in your email application.'; // 纯文本消息正文。不支持html预览的邮件客户端将显示此预览消息,其它情况将显示正常的body
          */
         if ($type === 1) {
-            $template = file_get_contents(RESOURCES_PATH . '/mail/notice.html');
+            $template = file_get_contents($this->noticeTemplatePath);
             $message = sprintf($template, $content);
         } else if ($type === 2) {
-            $template = file_get_contents(RESOURCES_PATH . '/mail/successful_renewal.html');
+            $template = file_get_contents($this->successfulRenewalTemplatePath);
             $realData = [
                 $data['username'],
-                $data['renewalSuccessArr'] ? sprintf('续期成功:%s<br>', $this->genDomainsHtml($data['renewalSuccessArr'])) : '',
-                $data['renewalFailuresArr'] ? sprintf('续期出错:%s<br>', $this->genDomainsHtml($data['renewalFailuresArr'])) : '',
+                $data['renewalSuccessArr'] ? sprintf(lang('100075'), $this->genDomainsHtml($data['renewalSuccessArr'])) : '',
+                $data['renewalFailuresArr'] ? sprintf(lang('100076'), $this->genDomainsHtml($data['renewalFailuresArr'])) : '',
                 $this->genDomainStatusHtml($data['domainStatusArr'])
             ];
             $message = $this->genMessageContent($realData, $template);
         } else if ($type === 3) {
-            $template = file_get_contents(RESOURCES_PATH . '/mail/no_renewal_required.html');
+            $template = file_get_contents($this->noRenewalRequiredTemplatePath);
             $realData = [
                 $data['username'],
                 $this->genDomainStatusHtml($data['domainStatusArr'])
             ];
             $message = $this->genMessageContent($realData, $template);
         } else if ($type === 4) {
-            $template = file_get_contents(RESOURCES_PATH . '/mail/notice.html');
+            $template = file_get_contents($this->noticeTemplatePath);
             $message = sprintf($template, $this->newLine2Br($content));
         } else {
-            throw new \Exception(lang('error_msg.100003'));
+            throw new \Exception(lang('100003'));
         }
 
-        $this->phpMailerInstance->msgHTML($message, APP_PATH . '/mail');
+        $this->phpMailerInstance->msgHTML($message, RESOURCES_PATH . '/mail/' . $this->language);
 
         try {
             if (!$this->phpMailerInstance->send()) {
@@ -229,7 +234,7 @@ class Mail extends MessageGateway
 
             return true;
         } catch (\Exception $e) {
-            system_log('邮件发送失败:' . $e->getMessage());
+            system_log(lang('100077') . $e->getMessage());
 
             return false;
         }

+ 13 - 13
libs/MessageServices/ServerChan.php

@@ -48,7 +48,7 @@ class ServerChan extends MessageGateway
      */
     public function genDomainStatusFullMarkDownText(string $username, array $domainStatus)
     {
-        $markDownText = sprintf("我刚刚帮小主看了一下,账户 [%s](#) 今天并没有需要续期的域名。所有域名情况如下:\n\n", $username);
+        $markDownText = sprintf(lang('100090'), $username);
 
         $markDownText .= $this->genDomainStatusMarkDownText($domainStatus);
 
@@ -66,8 +66,8 @@ class ServerChan extends MessageGateway
     {
         $footer = '';
 
-        $footer .= "\n更多信息可以参考 [Freenom官网](https://my.freenom.com/domains.php?a=renewals) 哦~";
-        $footer .= "\n\n(如果你不想每次执行都收到推送,请将 .env 中 NOTICE_FREQ 的值设为 0,使程序只在有续期操作时才推送)";
+        $footer .= lang('100091');
+        $footer .= lang('100092');
 
         return $footer;
     }
@@ -82,16 +82,16 @@ class ServerChan extends MessageGateway
     public function genDomainStatusMarkDownText(array $domainStatus)
     {
         if (empty($domainStatus)) {
-            return "无数据。\n";
+            return lang('100093');
         }
 
         $domainStatusMarkDownText = '';
 
         foreach ($domainStatus as $domain => $daysLeft) {
-            $domainStatusMarkDownText .= sprintf('[%s](http://%s) 还有 *%d* 天到期,', $domain, $domain, $daysLeft);
+            $domainStatusMarkDownText .= sprintf(lang('100094'), $domain, $domain, $daysLeft);
         }
 
-        $domainStatusMarkDownText = rtrim($domainStatusMarkDownText, ',') . "。\n";
+        $domainStatusMarkDownText = rtrim(rtrim($domainStatusMarkDownText, ' '), ',,') . lang('100095');
 
         return $domainStatusMarkDownText;
     }
@@ -108,19 +108,19 @@ class ServerChan extends MessageGateway
      */
     public function genDomainRenewalResultsMarkDownText(string $username, array $renewalSuccessArr, array $renewalFailuresArr, array $domainStatus)
     {
-        $text = sprintf("账户 [%s](#) 这次续期的结果如下\n\n", $username);
+        $text = sprintf(lang('100096'), $username);
 
         if ($renewalSuccessArr) {
-            $text .= '续期成功:';
+            $text .= lang('100097');
             $text .= $this->genDomainsMarkDownText($renewalSuccessArr);
         }
 
         if ($renewalFailuresArr) {
-            $text .= '续期出错:';
+            $text .= lang('100098');
             $text .= $this->genDomainsMarkDownText($renewalFailuresArr);
         }
 
-        $text .= "\n今次无需续期的域名及其剩余天数如下所示:\n\n";
+        $text .= lang('100099');
         $text .= $this->genDomainStatusMarkDownText($domainStatus);
 
         $text .= $this->getMarkDownFooter();
@@ -172,7 +172,7 @@ class ServerChan extends MessageGateway
         } else if ($type === 3) {
             $content = $this->genDomainStatusFullMarkDownText($data['username'], $data['domainStatusArr']);
         } else {
-            throw new \Exception(lang('error_msg.100003'));
+            throw new \Exception(lang('100003'));
         }
 
         $subject = $subject === '' ? mb_substr($content, 0, 12) . '...' : $subject;
@@ -194,9 +194,9 @@ class ServerChan extends MessageGateway
                 return true;
             }
 
-            throw new \Exception($resp['message'] ?? '未知原因');
+            throw new \Exception($resp['message'] ?? lang('100100'));
         } catch (\Exception $e) {
-            system_log('Server酱 消息发送失败:<red>' . $e->getMessage() . '</red>');
+            system_log(sprintf(lang('100101'), $e->getMessage()));
 
             return false;
         }

+ 12 - 12
libs/MessageServices/TelegramBot.php

@@ -59,7 +59,7 @@ class TelegramBot extends MessageGateway
      */
     public function genDomainStatusFullMarkDownText(string $username, array $domainStatus)
     {
-        $markDownText = sprintf("我刚刚帮小主看了一下,账户 %s 今天并没有需要续期的域名。所有域名情况如下:\n\n", $username);
+        $markDownText = sprintf(lang('100102'), $username);
 
         $markDownText .= $this->genDomainStatusMarkDownText($domainStatus);
 
@@ -77,8 +77,8 @@ class TelegramBot extends MessageGateway
     {
         $footer = '';
 
-        $footer .= "\n更多信息可以参考 [Freenom官网](https://my.freenom.com/domains.php?a=renewals) 哦~";
-        $footer .= "\n\n(如果你不想每次执行都收到推送,请将 .env 中 NOTICE_FREQ 的值设为 0,使程序只在有续期操作时才推送)";
+        $footer .= lang('100103');
+        $footer .= lang('100104');
 
         return $footer;
     }
@@ -93,16 +93,16 @@ class TelegramBot extends MessageGateway
     public function genDomainStatusMarkDownText(array $domainStatus)
     {
         if (empty($domainStatus)) {
-            return "无数据。\n";
+            return lang('100105');
         }
 
         $domainStatusMarkDownText = '';
 
         foreach ($domainStatus as $domain => $daysLeft) {
-            $domainStatusMarkDownText .= sprintf('[%s](http://%s) 还有 *%d* 天到期,', $domain, $domain, $daysLeft);
+            $domainStatusMarkDownText .= sprintf(lang('100106'), $domain, $domain, $daysLeft);
         }
 
-        $domainStatusMarkDownText = rtrim($domainStatusMarkDownText, ',') . "。\n";
+        $domainStatusMarkDownText = rtrim(rtrim($domainStatusMarkDownText, ' '), ',,') . lang('100107');
 
         return $domainStatusMarkDownText;
     }
@@ -119,19 +119,19 @@ class TelegramBot extends MessageGateway
      */
     public function genDomainRenewalResultsMarkDownText(string $username, array $renewalSuccessArr, array $renewalFailuresArr, array $domainStatus)
     {
-        $text = sprintf("账户 %s 这次续期的结果如下\n\n", $username);
+        $text = sprintf(lang('100108'), $username);
 
         if ($renewalSuccessArr) {
-            $text .= '续期成功:';
+            $text .= lang('100109');
             $text .= $this->genDomainsMarkDownText($renewalSuccessArr);
         }
 
         if ($renewalFailuresArr) {
-            $text .= '续期出错:';
+            $text .= lang('100110');
             $text .= $this->genDomainsMarkDownText($renewalFailuresArr);
         }
 
-        $text .= "\n今次无需续期的域名及其剩余天数如下所示:\n\n";
+        $text .= lang('100111');
         $text .= $this->genDomainStatusMarkDownText($domainStatus);
 
         $text .= $this->getMarkDownFooter();
@@ -238,7 +238,7 @@ class TelegramBot extends MessageGateway
         } else if ($type === 3) {
             $content = $this->genDomainStatusFullMarkDownText($data['username'], $data['domainStatusArr']);
         } else {
-            throw new \Exception(lang('error_msg.100003'));
+            throw new \Exception(lang('100003'));
         }
 
         $isMarkdown = true;
@@ -288,7 +288,7 @@ class TelegramBot extends MessageGateway
 
             return $resp['ok'] ?? false;
         } catch (\Exception $e) {
-            system_log('Telegram 消息发送失败:<red>' . $e->getMessage() . '</red>');
+            system_log(sprintf(lang('100112'), $e->getMessage()));
 
             return false;
         }

+ 16 - 16
libs/MessageServices/WeChat.php

@@ -120,13 +120,13 @@ class WeChat extends MessageGateway
         if (isset($resp['errcode']) && $resp['errcode'] === 0 && isset($resp['access_token']) && isset($resp['expires_in'])) {
             $accessTokenFileText = sprintf("WECHAT_ACCESS_TOKEN=%s\nWECHAT_ACCESS_TOKEN_EXPIRES_AT=%s\n", $resp['access_token'], time() + $resp['expires_in']);
             if (file_put_contents($this->accessTokenFile, $accessTokenFileText) === false) {
-                throw new \Exception('企业微信 access_token 写入失败:' . $this->accessTokenFile);
+                throw new \Exception(lang('100113') . $this->accessTokenFile);
             }
 
             return $resp['access_token'];
         }
 
-        throw new \Exception('获取企业微信 access_token 失败:' . ($resp['errmsg'] ?? '未知原因'));
+        throw new \Exception(lang('100114') . ($resp['errmsg'] ?? lang('100115')));
     }
 
     /**
@@ -158,8 +158,8 @@ class WeChat extends MessageGateway
     {
         $footer = '';
 
-        $footer .= "\n更多信息可以参考 <a href=\"https://my.freenom.com/domains.php?a=renewals\">Freenom官网</a> 哦~";
-        $footer .= "\n\n(如果你不想每次执行都收到推送,请将 .env 中 NOTICE_FREQ 的值设为 0,使程序只在有续期操作时才推送)";
+        $footer .= lang('100116');
+        $footer .= lang('100117');
 
         return $footer;
     }
@@ -174,16 +174,16 @@ class WeChat extends MessageGateway
     public function genDomainStatusText(array $domainStatus)
     {
         if (empty($domainStatus)) {
-            return "无数据。\n";
+            return lang('100118');
         }
 
         $domainStatusText = '';
 
         foreach ($domainStatus as $domain => $daysLeft) {
-            $domainStatusText .= sprintf('<a href="http://%s">%s</a> 还有 <a href="http://%s">%d</a> 天到期,', $domain, $domain, $domain, $daysLeft);
+            $domainStatusText .= sprintf(lang('100119'), $domain, $domain, $domain, $daysLeft);
         }
 
-        $domainStatusText = rtrim($domainStatusText, ',') . "。\n";
+        $domainStatusText = rtrim(rtrim($domainStatusText, ' '), ',,') . lang('100120');
 
         return $domainStatusText;
     }
@@ -200,19 +200,19 @@ class WeChat extends MessageGateway
      */
     public function genDomainRenewalResultsText(string $username, array $renewalSuccessArr, array $renewalFailuresArr, array $domainStatus)
     {
-        $text = sprintf("账户 <a href=\"https://www.google.com\">%s</a> 这次续期的结果如下\n\n", $username);
+        $text = sprintf(lang('100121'), $username);
 
         if ($renewalSuccessArr) {
-            $text .= '续期成功:';
+            $text .= lang('100122');
             $text .= $this->genDomainsText($renewalSuccessArr);
         }
 
         if ($renewalFailuresArr) {
-            $text .= '续期出错:';
+            $text .= lang('100123');
             $text .= $this->genDomainsText($renewalFailuresArr);
         }
 
-        $text .= "\n今次无需续期的域名及其剩余天数如下所示:\n\n";
+        $text .= lang('100124');
         $text .= $this->genDomainStatusText($domainStatus);
 
         $text .= $this->getFooter();
@@ -230,7 +230,7 @@ class WeChat extends MessageGateway
      */
     public function genDomainStatusFullText(string $username, array $domainStatus)
     {
-        $markDownText = sprintf("我刚刚帮小主看了一下,账户 <a href=\"https://www.google.com\">%s</a> 今天并没有需要续期的域名。所有域名情况如下:\n\n", $username);
+        $markDownText = sprintf(lang('100125'), $username);
 
         $markDownText .= $this->genDomainStatusText($domainStatus);
 
@@ -270,7 +270,7 @@ class WeChat extends MessageGateway
         } else if ($type === 3) {
             $content = $this->genDomainStatusFullText($data['username'], $data['domainStatusArr']);
         } else {
-            throw new \Exception(lang('error_msg.100003'));
+            throw new \Exception(lang('100003'));
         }
 
         if ($subject !== '') {
@@ -293,7 +293,7 @@ class WeChat extends MessageGateway
 
             return $this->doSend($accessToken, $body);
         } catch (\Exception $e) {
-            system_log('企业微信送信失败:<red>' . $e->getMessage() . '</red>');
+            system_log(sprintf(lang('100126'), $e->getMessage()));
 
             return false;
         }
@@ -325,7 +325,7 @@ class WeChat extends MessageGateway
         $resp = (array)json_decode($resp, true);
 
         if (!isset($resp['errcode']) || !isset($resp['errmsg'])) {
-            throw new \Exception('企业微信接口未返回预期的数据响应,本次响应数据为:' . json_encode($resp, JSON_UNESCAPED_UNICODE));
+            throw new \Exception(lang('100127') . json_encode($resp, JSON_UNESCAPED_UNICODE));
         }
 
         if ($resp['errcode'] === 0) {
@@ -334,7 +334,7 @@ class WeChat extends MessageGateway
             $accessToken = $this->getAccessToken(true);
 
             if ($numOfRetries > 2) {
-                throw new \Exception('检测到多次提示 access_token 失效,可能是未能正确获取 access_token,请介入调查:' . $resp['errmsg']);
+                throw new \Exception(lang('100128') . $resp['errmsg']);
             }
 
             $numOfRetries++;

+ 155 - 0
resources/lang/en.php

@@ -0,0 +1,155 @@
+<?php
+/**
+ * 英文语言包
+ *
+ * @author mybsdc <[email protected]>
+ * @date 2018/8/10
+ * @time 14:39
+ */
+
+return [
+    'exception_msg' => [
+        '34520001' => 'It is detected that you have not configured your freenom account information, please change the account related items in the .env file, otherwise the program will not work properly',
+        '34520002' => 'Error logging into freenom. Error message: %s',
+        '34520003' => 'Domain data match failed, maybe you don\'t have a domain name or the page of freenom has changed causing the regular expression to fail, please contact the author promptly: https://github.com/luolongfei/freenom/issues',
+        '34520004' => 'token match failed, may be the regular expression failed due to the page revision, please contact the author promptly: https://github.com/luolongfei/freenom/issues',
+        '34520005' => 'The putenv() function is disabled and cannot write to environment variables, so the program does not work properly, please enable the putenv() function',
+        '34520006' => 'The version of PHP is not allowed to be less than %s, the current version of PHP is %s, please upgrade your version of PHP, otherwise it will not work properly. If it is not convenient to upgrade PHP, we recommend using the Docker version of this project: https://hub.docker.com/r/luolongfei/freenom',
+        '34520007' => sprintf('The .env configuration file is automatically generated in the %s directory, please change the contents of the configuration file to your own', ROOT_PATH),
+        '34520008' => sprintf('Please copy the .env.example file in the %s directory to an .env file and change the contents of the .env file to your own', ROOT_PATH),
+        '34520009' => 'Error getting domain status, probably not logged in or login is invalid, please try again',
+        '34520010' => 'Missing curl module, can\'t send request, please check your php environment and add curl module at compile time',
+        '34520012' => 'You have not configured an email address for incoming mail and may not receive mail. Please change the value corresponding to TO in the .env file to the email address you use most often to receive domain-related emails from the robot email address',
+        '34520013' => 'Error getting domain status, error message: %s',
+    ],
+    'messages' => [
+        '100001' => 'The cookie value named WHMCSZH5eHTGhfvzP could not be obtained, so this login is not valid, please check if your account or password is correct',
+        '100002' => 'Not allowed to send empty content emails',
+        '100003' => 'Illegal message types',
+        '100004' => "Execution error: \n",
+        '100005' => 'Master, I just captured an anomaly',
+        '100006' => 'Execution error: <red>%s</red>',
+        '100007' => 'Cloud function executed successfully.',
+        '100008' => 'Cloud function execution failed.',
+        '100009' => 'Your runtime environment is a cloud function, all environment variables will be read directly from the environment, and those variables not found in the environment will be read directly from the .env.example file',
+        '100010' => 'If it is in the Tencent cloud function, you can refer here to modify or add environment variables without rebuilding: https://github.com/luolongfei/freenom/blob/main/resources/screenshot/scf03.png',
+        '100011' => 'If it is in Aliyun cloud function, you can directly edit the environment variable at [Function Details] -> [Function Configuration] -> [Environment Information]',
+        '100012' => 'Because you did not turn on the upgrade alert feature, you will not be notified when a new version is available. Change the value of NEW_VERSION_DETECTION in the .env file to 1 to turn the feature back on.',
+        '100013' => 'Your .env file is too old, the program will automatically update the relevant configuration items according to the .env.example file, don\'t panic, this operation will not have any effect on the existing data',
+        '100014' => '<green>Backup of .env file completed</green>, old file location is %s/.env.old',
+        '100015' => 'A new .env file has been generated',
+        '100016' => '<green>Data migration complete</green>, %d environment variable data migrated',
+        '100017' => '<green>Congratulations, .env file upgrade completed</green>',
+        '100018' => 'Error upgrading .env file: ',
+        '100019' => 'Error generating an .env file from an .env.example file',
+        '100020' => 'Error when backing up .env file to .env.old file',
+        '100021' => 'File does not exist: ',
+        '100022' => 'Failed to read file content: ',
+        '100023' => 'Github returns data inconsistent with expectations: ',
+        '100024' => 'Detect upgrade error: ',
+        '100025' => "Hello, we have released a new version of FreeNom renewal tool v%s at %s, and the version you are currently using is v%s, you can decide whether to upgrade to the new version according to your actual needs. The new version has the following updates or improvements: \n\n",
+        '100026' => 'For more information, please visit: ',
+        '100027' => '(This message will only be pushed once for the same new version. If you do not want to be notified of new releases, set the value of NEW_VERSION_DETECTION in the .env file to 0)',
+        '100028' => 'just now',
+        '100029' => 'minutes ago',
+        '100030' => 'hours ago',
+        '100031' => 'yesterday ',
+        '100032' => 'Error in conversion to human friendly time: ',
+        '100033' => 'There is a new version of the FreeNom renewal tool available, your current version is v%s and the latest version is v%s. For more information about the new version, please visit: %s',
+        '100034' => '<green>New versions of the FreeNom renewal tool are available, the latest version is v%s (%s)</green>',
+        '100035' => 'Hi, there is a new version (v%s) of the FreeNom renewal tool available and a message has been sent to you about the new version',
+        '100036' => 'Information about the new version has been sent to you, please check it.',
+        '100037' => 'Upgrade error: ',
+        '100038' => 'Version %s',
+        '100039' => 'Master, I just renewed your domain name!',
+        '100040' => 'Congratulations, successfully renewed <green>%d</green> domains, failed <green>%d</green> domains. %s',
+        '100041' => 'A detailed renewal result message has been sent to you, please check it.',
+        '100042' => "Account: %s\n Renewal results are as follows:\n",
+        '100043' => 'Report, no domains need to be renewed today',
+        '100044' => 'The current notification frequency is "only when there is a renewal operation", so no notification will be pushed this time',
+        '100045' => '%s: <light_green>executed successfully, there are no domains that need to be renewed this time. </light_green>',
+        '100046' => 'Renewal Request Error: %s, Domain ID: %s (Account: %s)',
+        '100047' => 'Specifically, an exception was thrown at line %d of the %s file. The exception is %s, so go check it out. (Account: %s)',
+        '100048' => 'Master, something went wrong: ',
+        '100049' => 'A total of <light_cyan>%d</light_cyan> freenom accounts were found',
+        '100050' => 'Start processing the <light_cyan>%s</light_cyan> freenom account [%d/%d]',
+        '100051' => 'Error: <red>%s</red>',
+        '100052' => 'Error: <red>%s</red>',
+        '100053' => 'An instance of the class named %s already exists',
+        '100054' => 'Class named %s does not exist',
+        '100055' => 'Since the "%s" feature is not enabled, the message will not be sent via "%s" this time, even though the relevant configuration is detected.',
+        '100056' => 'The message service class %s must inherit and implement the MessageServiceInterface interface',
+        '100057' => 'Unexpected program termination',
+        '100058' => 'There may be an error, the error message collected is: ',
+        '100059' => 'Master, the program was unexpectedly terminated',
+        '100060' => 'Uncaught exceptions: ',
+        '100061' => "The specific exception is: \n",
+        '100062' => 'Master, Uncaught Exception',
+        '100063' => 'Start executing Aliyun cloud functions',
+        '100064' => 'Email',
+        '100065' => 'Telegram Bot',
+        '100066' => 'Corporate WeChat',
+        '100067' => 'Server Chan',
+        '100068' => 'Bark',
+        '100069' => 'At present, Gmail, QQ mailbox, 163 mailbox and Outlook mailbox are supported for auto-identification configuration. For other types of mailboxes or self-built mailboxes, please append all relevant items of "custom mailbox configuration" in the .env file, otherwise you can\'t use mail service.',
+        '100070' => 'No data.',
+        '100071' => '<a href="http://%s" rel="noopener" target="_blank">%s</a> expires in <span style="font-weight: bold; font-size: 16px;">%d</span> days, ',
+        '100072' => '.',
+        '100073' => 'Master',
+        '100074' => 'Project Author',
+        '100075' => 'Renewal success: %s<br>',
+        '100076' => 'Renewal error: %s<br>',
+        '100077' => 'Mail sending failure: ',
+        '100078' => "\nFor more information, please refer to: https://my.freenom.com/domains.php?a=renewals (click \"copy content\" to copy this URL)",
+        '100079' => "\n\n(if you don't want to receive a push every time you execute, set the value of NOTICE_FREQ in .env to 0 so that the program only pushes when there is a renewal operation)",
+        '100080' => "No data.\n",
+        '100081' => '%s expires in %d days, ',
+        '100082' => ".\n",
+        '100083' => "Account %s The result of this renewal is as follows\n\n",
+        '100084' => 'Renewal success: ',
+        '100085' => 'Renewal error: ',
+        '100086' => "\nThe domains that do not need to be renewed this time and their remaining days are shown below:\n\n",
+        '100087' => "I just checked for you and the account %s has no domains that need to be renewed today. The status of all domains is as follows:\n\n",
+        '100088' => 'Unknown reason',
+        '100089' => 'Bark Failed to send message: <red>%s</red>',
+        '100090' => "I just checked for you and the account [%s](#) does not have any domains that need to be renewed today. The status of all domains is as follows:\n\n",
+        '100091' => "\nFor more information, please refer to [Freenom official website](https://my.freenom.com/domains.php?a=renewals)",
+        '100092' => "\n\n(if you don't want to receive a push every time you execute, set the value of NOTICE_FREQ in .env to 0 so that the program only pushes when there is a renewal operation)",
+        '100093' => "No data.\n",
+        '100094' => '[%s](http://%s) expires in *%d* days, ',
+        '100095' => ".\n",
+        '100096' => "Account [%s](#) The results of this renewal are as follows\n\n",
+        '100097' => 'Renewal success: ',
+        '100098' => 'Renewal error: ',
+        '100099' => "\nThe domains that do not need to be renewed this time and their remaining days are shown below:\n\n",
+        '100100' => 'No known reason',
+        '100101' => 'ServerChan Failed to send message: <red>%s</red>',
+        '100102' => "I just checked for you and the account %s has no domains that need to be renewed today. The status of all domains is as follows:\n\n",
+        '100103' => "\nFor more information, please refer to [Freenom official website](https://my.freenom.com/domains.php?a=renewals)",
+        '100104' => "\n\n(if you don't want to receive a push every time you execute, set the value of NOTICE_FREQ in .env to 0 so that the program only pushes when there is a renewal operation)",
+        '100105' => "No data.\n",
+        '100106' => '[%s](http://%s) expires in *%d* days, ',
+        '100107' => ".\n",
+        '100108' => "Account %s The results of this renewal are as follows\n\n",
+        '100109' => 'Renewal success: ',
+        '100110' => 'Renewal error: ',
+        '100111' => "\nThe domains that do not need to be renewed this time and their remaining days are shown below:\n\n",
+        '100112' => 'Telegram failed to send a message: <red>%s</red>',
+        '100113' => 'Corporate WeChat access_token write failure: ',
+        '100114' => 'Get Corporate WeChat access_token Failed: ',
+        '100115' => 'No known reason',
+        '100116' => "\nFor more information, please refer to <a href=\"https://my.freenom.com/domains.php?a=renewals\">Freenom official website</a>",
+        '100117' => "\n\n(if you don't want to receive a push every time you execute, set the value of NOTICE_FREQ in .env to 0 so that the program only pushes when there is a renewal operation)",
+        '100118' => "No data.\n",
+        '100119' => '<a href="http://%s">%s</a> expires in <a href="http://%s">%d</a> days, ',
+        '100120' => ".\n",
+        '100121' => "Account <a href=\"https://www.google.com\">%s</a> The results of this renewal are as follows\n\n",
+        '100122' => 'Renewal success: ',
+        '100123' => 'Renewal error: ',
+        '100124' => "\nThe domains that do not need to be renewed this time and their remaining days are shown below:\n\n",
+        '100125' => "I just checked for you and the account <a href=\"https://www.google.com\">%s</a> has no domains that need to be renewed today. The status of all domains is as follows:\n\n",
+        '100126' => 'Corporate WeChat failed to send a message: <red>%s</red>',
+        '100127' => 'Corporate WeChat interface did not return the expected data response, this response data is: ',
+        '100128' => 'Multiple invalid access_token prompts have been detected, possibly because the access_token was not properly obtained, please intervene to investigate: ',
+    ],
+];

+ 130 - 5
resources/lang/zh.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 语言包
+ * 中文语言包
  *
  * @author mybsdc <[email protected]>
  * @date 2018/8/10
@@ -11,10 +11,10 @@ return [
     'exception_msg' => [
         '34520001' => '检测到你尚未配置 freenom 账户信息,请修改 .env 文件中与账户相关的项,否则程序无法正常运作',
         '34520002' => '登录 freenom 出错。错误信息:%s',
-        '34520003' => '域名数据匹配失败,可能是你暂时没有域名或者页面改版导致正则失效,请及时联系作者',
-        '34520004' => 'token 匹配失败,可能是页面改版导致正则失效,请及时联系作者',
+        '34520003' => '域名数据匹配失败,可能是你暂时没有域名或者页面改版导致正则失效,请及时联系作者:https://github.com/luolongfei/freenom/issues',
+        '34520004' => 'token 匹配失败,可能是页面改版导致正则失效,请及时联系作者:https://github.com/luolongfei/freenom/issues',
         '34520005' => 'putenv() 函数被禁用,无法写入环境变量导致程序无法正常运作,请启用 putenv() 函数',
-        '34520006' => sprintf('不支持 php7 以下的版本,当前版本为%s,请升级到 php7 以上', PHP_VERSION),
+        '34520006' => 'PHP 的版本不允许小于 %s,当前 PHP 版本为 %s,请升级你的 PHP 版本,否则无法正常运行。如果不方便升级 PHP,推荐使用本项目的 Docker 版:https://hub.docker.com/r/luolongfei/freenom',
         '34520007' => sprintf('已自动在%s目录下生成 .env 配置文件,请将配置文件中的各项内容修改为你自己的', ROOT_PATH),
         '34520008' => sprintf('请将%s目录下的 .env.example 文件复制为 .env 文件,并将 .env 文件中的各项内容修改为你自己的', ROOT_PATH),
         '34520009' => '获取域名状态页面出错,可能是未登录或者登录失效,请重试。',
@@ -22,9 +22,134 @@ return [
         '34520012' => '你尚未配置收信邮箱,可能无法收到通知邮件。请将 .env 文件中的 TO 对应的值改为你最常用的邮箱地址,用于接收机器人邮箱发出的域名相关邮件',
         '34520013' => '获取域名状态页面出错,错误信息:%s',
     ],
-    'error_msg' => [
+    'messages' => [
         '100001' => '未能取得名为 WHMCSZH5eHTGhfvzP 的 cookie 值,故本次登录无效,请检查你的账户或密码是否正确。',
         '100002' => '不允许发送空内容邮件',
         '100003' => '非法消息类型',
+        '100004' => "执行出错:\n",
+        '100005' => '主人,捕获异常',
+        '100006' => '执行出错:<red>%s</red>',
+        '100007' => '云函数执行成功。',
+        '100008' => '云函数执行失败。',
+        '100009' => '检测到运行环境为云函数,所有环境变量将直接从环境中读取,环境中找不到的变量,则直接从 .env.example 文件中读取',
+        '100010' => '如果是在腾讯云函数,可以参考此处修改或新增环境变量,无需重建:https://github.com/luolongfei/freenom/blob/main/resources/screenshot/scf03.png',
+        '100011' => '如果是在阿里云函数,可以直接在【函数详情】->【函数配置】->【环境信息】处编辑环境变量',
+        '100012' => '由于你没有开启升级提醒功能,故无法在有新版本可用时第一时间收到通知。将 .env 文件中 NEW_VERSION_DETECTION 的值改为 1 即可重新开启相关功能。',
+        '100013' => '检测到你的 .env 文件内容过旧,程式将根据 .env.example 文件自动更新相关配置项,不要慌张,此操作对已有数据不会有任何影响',
+        '100014' => '<green>已完成 .env 文件备份</green>,旧文件位置为 %s/.env.old',
+        '100015' => '已生成新 .env 文件',
+        '100016' => '<green>数据迁移完成</green>,共迁移 %d 条环境变量数据',
+        '100017' => '<green>恭喜,已成功完成 .env 文件升级</green>',
+        '100018' => '升级 .env 文件出错:',
+        '100019' => '从 .env.example 文件生成 .env 文件时出错',
+        '100020' => '备份 .env 文件到 .env.old 文件时出错',
+        '100021' => '文件不存在:',
+        '100022' => '读取文件内容失败:',
+        '100023' => 'Github 返回的数据与预期不一致:',
+        '100024' => '检测升级出错:',
+        '100025' => "见信好,我们在 %s 发布了新版 FreeNom 续期工具 v%s,而你当前正在使用的版本为 v%s,你可以根据自己的实际需要决定是否升级到新版本。今次新版有以下更新或改进:\n\n",
+        '100026' => '欲知更多信息,请访问:',
+        '100027' => '(本消息针对同一个新版只会推送一次,如果你不想收到新版本通知,将 .env 文件中的 NEW_VERSION_DETECTION 的值设为 0 即可)',
+        '100028' => '刚刚',
+        '100029' => '分钟前',
+        '100030' => '小时前',
+        '100031' => '昨天 ',
+        '100032' => '转人类友好时间出错:',
+        '100033' => 'FreeNom 续期工具有新的版本可用,你当前版本为 v%s,最新版本为 v%s。关于新版的详细信息,请访问:%s',
+        '100034' => '<green>FreeNom 续期工具有新的版本可用,最新版本为 v%s(%s)</green>',
+        '100035' => '主人,FreeNom 续期工具有新的版本(v%s)可用,新版相关情况已给到你',
+        '100036' => '有关新版的信息已送信给到你,请注意查收。',
+        '100037' => '升级出错:',
+        '100038' => '当前程序版本 %s',
+        '100039' => '主人,我刚刚帮你续期域名啦~',
+        '100040' => '恭喜,成功续期 <green>%d</green> 个域名,失败 <green>%d</green> 个域名。%s',
+        '100041' => '详细的续期结果已送信成功,请注意查收。',
+        '100042' => "账户:%s\n续期结果如下:\n",
+        '100043' => '报告,今天没有域名需要续期',
+        '100044' => '当前通知频率为「仅当有续期操作时」,故本次不会推送通知',
+        '100045' => '%s:<light_green>执行成功,今次没有需要续期的域名。</light_green>',
+        '100046' => '续期请求出错:%s,域名 ID:%s(账户:%s)',
+        '100047' => '具体是在%s文件的第%d行,抛出了一个异常。异常的内容是%s,快去看看吧。(账户:%s)',
+        '100048' => '主人,出错了,',
+        '100049' => '共发现 <light_cyan>%d</light_cyan> 个 freenom 账户',
+        '100050' => '开始处理第 <light_cyan>%d</light_cyan> 个 freenom 账户 [%d/%d]',
+        '100051' => '出错:<red>%s</red>',
+        '100052' => '出错:<red>%s</red>',
+        '100053' => '类 %s 的实例已存在',
+        '100054' => '类 %s 不存在',
+        '100055' => '由于没有启用「%s」功能,故本次不通过「%s」送信,尽管检测到相关配置。',
+        '100056' => '消息服务类 %s 必须继承并实现 MessageServiceInterface 接口',
+        '100057' => '程序意外终止',
+        '100058' => '可能存在错误,这边收集到的错误信息为:',
+        '100059' => '主人,程序意外终止',
+        '100060' => '未捕获的异常:',
+        '100061' => "具体的异常内容是:\n",
+        '100062' => '主人,未捕获的异常',
+        '100063' => '开始执行阿里云函数',
+        '100064' => '邮件',
+        '100065' => 'Telegram Bot',
+        '100066' => '企业微信',
+        '100067' => 'Server 酱',
+        '100068' => 'Bark',
+        '100069' => '目前支持Gmail、QQ邮箱、163邮箱以及Outlook邮箱自动识别配置,其它类型的邮箱或者自建邮箱,请在 .env 文件中追加“自定义邮箱配置”的所有相关项,否则无法使用邮件服务。',
+        '100070' => '无数据。',
+        '100071' => '<a href="http://%s" rel="noopener" target="_blank">%s</a>还有 <span style="font-weight: bold; font-size: 16px;">%d</span> 天到期,',
+        '100072' => '。',
+        '100073' => '主人',
+        '100074' => '作者',
+        '100075' => '续期成功:%s<br>',
+        '100076' => '续期出错:%s<br>',
+        '100077' => '邮件发送失败:',
+        '100078' => "\n更多信息可以参考:https://my.freenom.com/domains.php?a=renewals(点击“复制内容”即可复制此网址)",
+        '100079' => "\n\n(如果你不想每次执行都收到推送,请将 .env 中 NOTICE_FREQ 的值设为 0,使程序只在有续期操作时才推送)",
+        '100080' => "无数据。\n",
+        '100081' => '%s 还有 %d 天到期,',
+        '100082' => "。\n",
+        '100083' => "账户 %s 这次续期的结果如下\n\n",
+        '100084' => '续期成功:',
+        '100085' => '续期出错:',
+        '100086' => "\n今次无需续期的域名及其剩余天数如下所示:\n\n",
+        '100087' => "我刚刚帮小主看了一下,账户 %s 今天并没有需要续期的域名。所有域名情况如下:\n\n",
+        '100088' => '未知原因',
+        '100089' => 'Bark 送信失败:<red>%s</red>',
+        '100090' => "我刚刚帮小主看了一下,账户 [%s](#) 今天并没有需要续期的域名。所有域名情况如下:\n\n",
+        '100091' => "\n更多信息可以参考 [Freenom官网](https://my.freenom.com/domains.php?a=renewals) 哦~",
+        '100092' => "\n\n(如果你不想每次执行都收到推送,请将 .env 中 NOTICE_FREQ 的值设为 0,使程序只在有续期操作时才推送)",
+        '100093' => "无数据。\n",
+        '100094' => '[%s](http://%s) 还有 *%d* 天到期,',
+        '100095' => "。\n",
+        '100096' => "账户 [%s](#) 这次续期的结果如下\n\n",
+        '100097' => '续期成功:',
+        '100098' => '续期出错:',
+        '100099' => "\n今次无需续期的域名及其剩余天数如下所示:\n\n",
+        '100100' => '未知原因',
+        '100101' => 'Server酱 消息发送失败:<red>%s</red>',
+        '100102' => "我刚刚帮小主看了一下,账户 %s 今天并没有需要续期的域名。所有域名情况如下:\n\n",
+        '100103' => "\n更多信息可以参考 [Freenom官网](https://my.freenom.com/domains.php?a=renewals) 哦~",
+        '100104' => "\n\n(如果你不想每次执行都收到推送,请将 .env 中 NOTICE_FREQ 的值设为 0,使程序只在有续期操作时才推送)",
+        '100105' => "无数据。\n",
+        '100106' => '[%s](http://%s) 还有 *%d* 天到期,',
+        '100107' => "。\n",
+        '100108' => "账户 %s 这次续期的结果如下\n\n",
+        '100109' => '续期成功:',
+        '100110' => '续期出错:',
+        '100111' => "\n今次无需续期的域名及其剩余天数如下所示:\n\n",
+        '100112' => 'Telegram 消息发送失败:<red>%s</red>',
+        '100113' => '企业微信 access_token 写入失败:',
+        '100114' => '获取企业微信 access_token 失败:',
+        '100115' => '未知原因',
+        '100116' => "\n更多信息可以参考 <a href=\"https://my.freenom.com/domains.php?a=renewals\">Freenom官网</a> 哦~",
+        '100117' => "\n\n(如果你不想每次执行都收到推送,请将 .env 中 NOTICE_FREQ 的值设为 0,使程序只在有续期操作时才推送)",
+        '100118' => "无数据。\n",
+        '100119' => '<a href="http://%s">%s</a> 还有 <a href="http://%s">%d</a> 天到期,',
+        '100120' => "。\n",
+        '100121' => "账户 <a href=\"https://www.google.com\">%s</a> 这次续期的结果如下\n\n",
+        '100122' => '续期成功:',
+        '100123' => '续期出错:',
+        '100124' => "\n今次无需续期的域名及其剩余天数如下所示:\n\n",
+        '100125' => "我刚刚帮小主看了一下,账户 <a href=\"https://www.google.com\">%s</a> 今天并没有需要续期的域名。所有域名情况如下:\n\n",
+        '100126' => '企业微信送信失败:<red>%s</red>',
+        '100127' => '企业微信接口未返回预期的数据响应,本次响应数据为:',
+        '100128' => '检测到多次提示 access_token 失效,可能是未能正确获取 access_token,请介入调查:',
     ],
 ];

+ 380 - 0
resources/mail/en/no_renewal_required.html

@@ -0,0 +1,380 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta charset="UTF-8">
+    <title>Email notification</title>
+    <style>
+        .mmsgLetter {
+            width: 580px;
+            margin: 0 auto;
+            padding: 10px;
+            color: #333;
+            background: #fff;
+            border: 0px solid #aaa;
+            border-radius: 5px;
+            -webkit-box-shadow: 3px 3px 10px #999 !important;
+            -moz-box-shadow: 3px 3px 10px #999 !important;
+            box-shadow: 3px 3px 10px #999 !important;
+            font-family: Verdana, sans-serif;
+        }
+
+        .mmsgLetter a:link,
+        .mmsgLetter a:visited {
+            color: #407700;
+        }
+
+        .mmsgLetterContent {
+            text-align: left;
+            padding: 30px;
+            font-size: 14px;
+            line-height: 1.5;
+            /*background: url('../images/ting.jpg') no-repeat top right;*/
+        }
+
+        .mmsgLetterContent h3 {
+            color: #000;
+            font-size: 20px;
+            font-weight: bold;
+            margin: 20px 0 20px;
+            border-top: 2px solid #eee;
+            padding: 20px 0 0 0;
+            font-family: "微软雅黑", "黑体", "Lucida Grande", Verdana, sans-serif;
+        }
+
+        .mmsgLetterContent p {
+            margin: 20px 0;
+            padding: 0;
+        }
+
+        .mmsgLetterContent .salutation {
+            font-weight: bold;
+        }
+
+        .mmsgLetterContent .mmsgMoreInfo {
+        }
+
+        .mmsgLetterContent a.mmsgButton {
+            display: block;
+            float: left;
+            height: 40px;
+            text-decoration: none;
+            text-align: center;
+            cursor: pointer;
+        }
+
+        .mmsgLetterContent a.mmsgButton span {
+            display: block;
+            float: left;
+            padding: 0 25px;
+            height: 40px;
+            line-height: 36px;
+            font-size: 14px;
+            font-weight: bold;
+            color: #fff;
+            text-shadow: 1px 0 0 #235e00;
+        }
+
+        .mmsgLetterContent a.mmsgButton:link,
+        .mmsgLetterContent a.mmsgButton:visited {
+            background: #338702 url('../images/mmsgletter_2_btn.png') no-repeat right -40px;
+        }
+
+        .mmsgLetterContent a.mmsgButton:link span,
+        .mmsgLetterContent a.mmsgButton:visited span {
+            background: url('../images/mmsgletter_2_btn.png') no-repeat 0 0;
+        }
+
+        .mmsgLetterContent a.mmsgButton:hover,
+        .mmsgLetterContent a.mmsgButton:active {
+            background: #338702 url('../images/mmsgletter_2_btn.png') no-repeat right -120px;
+        }
+
+        .mmsgLetterContent a.mmsgButton:hover span,
+        .mmsgLetterContent a.mmsgButton:active span {
+            background: url('../images/mmsgletter_2_btn.png') no-repeat 0 -80px;
+        }
+
+        .mmsgLetterInscribe {
+            padding: 40px 0 0;
+        }
+
+        .mmsgLetterInscribe .mmsgAvatar {
+            float: left;
+        }
+
+        .mmsgLetterInscribe .mmsgName {
+            margin: 0 0 10px;
+        }
+
+        .mmsgLetterInscribe .mmsgSender {
+            margin: 0 0 0 54px;
+        }
+
+        .mmsgLetterInscribe .mmsgInfo {
+            font-size: 12px;
+            margin: 0;
+            line-height: 1.2;
+        }
+
+        .mmsgLetterHeader {
+            height: 23px;
+            /*background: url('../images/mmsgletter_2_bg_topline.png') repeat-x 0 0;*/
+            background: 7px 0 repeat-x #FFF;
+            background-image: -webkit-repeating-linear-gradient(135deg, #4882CE, #4882CE 20px, #FFF 20px, #FFF 35px, #EB1B2E 35px, #EB1B2E 55px, #FFF 55px, #FFF 70px);
+            background-image: repeating-linear-gradient(-45deg, #4882CE, #4882CE 20px, #FFF 20px, #FFF 35px, #EB1B2E 35px, #EB1B2E 55px, #FFF 55px, #FFF 70px);
+            background-size: 110px 10px;
+        }
+
+        .mmsgLetterFooter {
+            margin: 16px;
+            text-align: center;
+            font-size: 12px;
+            color: #888;
+            text-shadow: 1px 0px 0px #eee;
+        }
+
+        .mmsgLetterClr {
+            clear: both;
+            overflow: hidden;
+            height: 1px;
+        }
+
+        .mmsgLetterUser {
+            padding: 10px 0;
+        }
+
+        .mmsgLetterUserItem {
+            padding: 0 0 20px 0;
+        }
+
+        .mmsgLetterUserAvatar {
+            height: 40px;
+            border: 1px solid #ccc;
+            padding: 2px;
+            display: block;
+            float: left;
+        }
+
+        .mmsgLetterUserAvatar img {
+            width: 40px;
+            height: 40px;
+        }
+
+        .mmsgLetterInfo {
+            margin-left: 48px;
+        }
+
+        .mmsgLetterName {
+            display: block;
+            color: #5fa207;
+            font-weight: bold;
+            margin-left: 10px;
+        }
+
+        .mmsgLetterDesc {
+            font-size: 12px;
+            float: left;
+            height: 43px;
+            background: url('../images/mmsgletter_chat_right.gif') no-repeat right top;
+        }
+
+        .mmsgLetterDesc div {
+            white-space: nowrap;
+            float: left;
+            height: 43px;
+            padding: 0 20px;
+            line-height: 40px;
+            background: url('../images/mmsgletter_chat_left.gif') no-repeat left top;
+        }
+
+        .mmsgLetterUser {
+        }
+
+        .mmsgLetterAvatar {
+            float: left;
+        }
+
+        .mmsgLetterInfo {
+            margin: 0 0 0 60px;
+        }
+
+        .mmsgLetterNickName {
+            font-size: 14px;
+            font-weight: bold;
+        }
+
+        .mmsgLetterUin {
+            font-size: 12px;
+            color: #666;
+        }
+
+        .mmsgLetterUser {
+            padding: 10px 0;
+        }
+
+        .mmsgLetterUserItem {
+            padding: 0 0 20px 0;
+        }
+
+        .mmsgLetterUserAvatar {
+            height: 40px;
+            border: 1px solid #ccc;
+            padding: 2px;
+            display: block;
+            float: left;
+        }
+
+        .mmsgLetterUserAvatar img {
+            width: 40px;
+            height: 40px;
+        }
+
+        .mmsgLetterInfo {
+            margin-left: 48px;
+        }
+
+        .mmsgLetterName {
+            display: block;
+            color: #5fa207;
+            font-weight: bold;
+            margin-left: 10px;
+            padding-top: 10px;
+        }
+
+        .mmsgLetterDesc {
+            font-size: 12px;
+            float: left;
+            height: 43px;
+            background: url('../images/mmsgletter_chat_right.gif') no-repeat right top;
+        }
+
+        .mmsgLetterDesc div {
+            white-space: nowrap;
+            float: left;
+            height: 43px;
+            padding: 0 20px;
+            line-height: 40px;
+            background: url('../images/mmsgletter_chat_left.gif') no-repeat left top;
+        }
+
+        .qmbox style,
+        .qmbox script,
+        .qmbox head,
+        .qmbox link,
+        .qmbox meta {
+            display: none !important;
+        }
+
+        #mailContentContainer .txt {
+            height: auto;
+        }
+
+        a {
+            color: #407700 !important;
+        }
+
+        .renewed {
+            color: #4882CE !important;
+        }
+
+        .notRenewed {
+            color: #EB1B2E !important;
+        }
+
+        .domainDays a {
+            color: #407700 !important;
+        }
+
+        .renewed a,
+        .notRenewed a,
+        .domainDays a {
+            /*color: inherit !important;*/
+            display: inline-block;
+            background: #ffffff;
+            min-width: 22px;
+            text-align: center;
+            padding: 4px 6px;
+            border-radius: 22px;
+            font-size: 14px;
+            font-weight: bold;
+            transition: 0.2s all ease-in-out;
+            text-decoration: none !important;
+            /*margin-right: 12px;*/
+        }
+
+        .renewed a,
+        .notRenewed a {
+            margin-right: 12px;
+        }
+
+        .renewed a {
+            color: inherit !important;
+            border: 2px solid #4882CE;
+        }
+
+        .notRenewed a {
+            color: inherit !important;
+            border: 2px solid #EB1B2E;
+        }
+
+        .domainDays a {
+            border: 2px solid #407700;
+        }
+
+        .renewed a:hover {
+            background-color: #4882CE;
+            color: #ffffff !important;
+        }
+
+        .notRenewed a:hover {
+            background-color: #EB1B2E;
+            color: #ffffff !important;
+        }
+
+        .domainDays a:hover {
+            background-color: #407700;
+            color: #ffffff !important;
+        }
+    </style>
+</head>
+<body>
+<div id="mailContentContainer" class="qmbox qm_con_body_content qqmail_webmail_only" style="">
+    <div style="background-color:#d0d0d0;background-image:url('../images/mmsgletter_2_bg.png');text-align:center;padding:40px;">
+        <div class="mmsgLetter">
+            <div class="mmsgLetterHeader" style="height:23px;"></div>
+            <div class="mmsgLetterContent"
+                 style="text-align:left;padding: 0 30px;font-size:14px;line-height:1.5;/*background:url('../images/ting.jpg') no-repeat top right;background-size: 224px 224px;*/">
+                <div>
+                    <p>
+                        <br>I just checked for you and the account <a href="#" rel="noopener">%s</a> has no domains that
+                        need to be renewed today. The status of all domains is as follows:
+                        <br>
+                        <br><span class="domainDays">%s</span>
+                        <br><br>
+                        For more information, please refer to the <a
+                            href="https://my.freenom.com/domains.php?a=renewals" target="_blank" rel="noopener">Freenom
+                        official website</a>
+                        <br>
+                        <br>(If you don't want to receive a push every time you execute, set the value of NOTICE_FREQ in
+                        .env to 0 so that the program only pushes when there is a renewal operation)
+                    </p>
+                </div>
+                <div class="mmsgLetterInscribe" style="padding:40px 0 0;">
+                    <img class="mmsgAvatar" src="https://q2.qlogo.cn/headimg_dl?dst_uin=593198779&spec=100"
+                         style="float:left;width:40px;height:40px;" alt="Author avatar">
+                    <div class="mmsgSender" style="margin:0 0 0 54px;">
+                        <p class="mmsgName" style="margin:0 0 10px;">Im Robot</p>
+                        <p class="mmsgInfo" style="font-size:12px;margin:0;line-height:1.2;">
+                            Freenom auto-renewal team <br>
+                            <a href="mailto:[email protected]" rel="noopener" target="_blank">[email protected]</a>
+                        </p>
+                    </div>
+                </div>
+            </div>
+            <div class="mmsgLetterFooter"
+                 style="margin:16px;text-align:center;font-size:12px;color:#888;text-shadow:1px 0px 0px #eee;"></div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

+ 370 - 0
resources/mail/en/notice.html

@@ -0,0 +1,370 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta charset="UTF-8">
+    <title>Email notification</title>
+    <style>
+        .mmsgLetter {
+            width: 580px;
+            margin: 0 auto;
+            padding: 10px;
+            color: #333;
+            background: #fff;
+            border: 0px solid #aaa;
+            border-radius: 5px;
+            -webkit-box-shadow: 3px 3px 10px #999 !important;
+            -moz-box-shadow: 3px 3px 10px #999 !important;
+            box-shadow: 3px 3px 10px #999 !important;
+            font-family: Verdana, sans-serif;
+        }
+
+        .mmsgLetter a:link,
+        .mmsgLetter a:visited {
+            color: #407700;
+        }
+
+        .mmsgLetterContent {
+            text-align: left;
+            padding: 30px;
+            font-size: 14px;
+            line-height: 1.5;
+            /*background: url('../images/ting.jpg') no-repeat top right;*/
+        }
+
+        .mmsgLetterContent h3 {
+            color: #000;
+            font-size: 20px;
+            font-weight: bold;
+            margin: 20px 0 20px;
+            border-top: 2px solid #eee;
+            padding: 20px 0 0 0;
+            font-family: "微软雅黑", "黑体", "Lucida Grande", Verdana, sans-serif;
+        }
+
+        .mmsgLetterContent p {
+            margin: 20px 0;
+            padding: 0;
+        }
+
+        .mmsgLetterContent .salutation {
+            font-weight: bold;
+        }
+
+        .mmsgLetterContent .mmsgMoreInfo {
+        }
+
+        .mmsgLetterContent a.mmsgButton {
+            display: block;
+            float: left;
+            height: 40px;
+            text-decoration: none;
+            text-align: center;
+            cursor: pointer;
+        }
+
+        .mmsgLetterContent a.mmsgButton span {
+            display: block;
+            float: left;
+            padding: 0 25px;
+            height: 40px;
+            line-height: 36px;
+            font-size: 14px;
+            font-weight: bold;
+            color: #fff;
+            text-shadow: 1px 0 0 #235e00;
+        }
+
+        .mmsgLetterContent a.mmsgButton:link,
+        .mmsgLetterContent a.mmsgButton:visited {
+            background: #338702 url('../images/mmsgletter_2_btn.png') no-repeat right -40px;
+        }
+
+        .mmsgLetterContent a.mmsgButton:link span,
+        .mmsgLetterContent a.mmsgButton:visited span {
+            background: url('../images/mmsgletter_2_btn.png') no-repeat 0 0;
+        }
+
+        .mmsgLetterContent a.mmsgButton:hover,
+        .mmsgLetterContent a.mmsgButton:active {
+            background: #338702 url('../images/mmsgletter_2_btn.png') no-repeat right -120px;
+        }
+
+        .mmsgLetterContent a.mmsgButton:hover span,
+        .mmsgLetterContent a.mmsgButton:active span {
+            background: url('../images/mmsgletter_2_btn.png') no-repeat 0 -80px;
+        }
+
+        .mmsgLetterInscribe {
+            padding: 40px 0 0;
+        }
+
+        .mmsgLetterInscribe .mmsgAvatar {
+            float: left;
+        }
+
+        .mmsgLetterInscribe .mmsgName {
+            margin: 0 0 10px;
+        }
+
+        .mmsgLetterInscribe .mmsgSender {
+            margin: 0 0 0 54px;
+        }
+
+        .mmsgLetterInscribe .mmsgInfo {
+            font-size: 12px;
+            margin: 0;
+            line-height: 1.2;
+        }
+
+        .mmsgLetterHeader {
+            height: 23px;
+            /*background: url('../images/mmsgletter_2_bg_topline.png') repeat-x 0 0;*/
+            background: 7px 0 repeat-x #FFF;
+            background-image: -webkit-repeating-linear-gradient(135deg, #4882CE, #4882CE 20px, #FFF 20px, #FFF 35px, #EB1B2E 35px, #EB1B2E 55px, #FFF 55px, #FFF 70px);
+            background-image: repeating-linear-gradient(-45deg, #4882CE, #4882CE 20px, #FFF 20px, #FFF 35px, #EB1B2E 35px, #EB1B2E 55px, #FFF 55px, #FFF 70px);
+            background-size: 110px 10px;
+        }
+
+        .mmsgLetterFooter {
+            margin: 16px;
+            text-align: center;
+            font-size: 12px;
+            color: #888;
+            text-shadow: 1px 0px 0px #eee;
+        }
+
+        .mmsgLetterClr {
+            clear: both;
+            overflow: hidden;
+            height: 1px;
+        }
+
+        .mmsgLetterUser {
+            padding: 10px 0;
+        }
+
+        .mmsgLetterUserItem {
+            padding: 0 0 20px 0;
+        }
+
+        .mmsgLetterUserAvatar {
+            height: 40px;
+            border: 1px solid #ccc;
+            padding: 2px;
+            display: block;
+            float: left;
+        }
+
+        .mmsgLetterUserAvatar img {
+            width: 40px;
+            height: 40px;
+        }
+
+        .mmsgLetterInfo {
+            margin-left: 48px;
+        }
+
+        .mmsgLetterName {
+            display: block;
+            color: #5fa207;
+            font-weight: bold;
+            margin-left: 10px;
+        }
+
+        .mmsgLetterDesc {
+            font-size: 12px;
+            float: left;
+            height: 43px;
+            background: url('../images/mmsgletter_chat_right.gif') no-repeat right top;
+        }
+
+        .mmsgLetterDesc div {
+            white-space: nowrap;
+            float: left;
+            height: 43px;
+            padding: 0 20px;
+            line-height: 40px;
+            background: url('../images/mmsgletter_chat_left.gif') no-repeat left top;
+        }
+
+        .mmsgLetterUser {
+        }
+
+        .mmsgLetterAvatar {
+            float: left;
+        }
+
+        .mmsgLetterInfo {
+            margin: 0 0 0 60px;
+        }
+
+        .mmsgLetterNickName {
+            font-size: 14px;
+            font-weight: bold;
+        }
+
+        .mmsgLetterUin {
+            font-size: 12px;
+            color: #666;
+        }
+
+        .mmsgLetterUser {
+            padding: 10px 0;
+        }
+
+        .mmsgLetterUserItem {
+            padding: 0 0 20px 0;
+        }
+
+        .mmsgLetterUserAvatar {
+            height: 40px;
+            border: 1px solid #ccc;
+            padding: 2px;
+            display: block;
+            float: left;
+        }
+
+        .mmsgLetterUserAvatar img {
+            width: 40px;
+            height: 40px;
+        }
+
+        .mmsgLetterInfo {
+            margin-left: 48px;
+        }
+
+        .mmsgLetterName {
+            display: block;
+            color: #5fa207;
+            font-weight: bold;
+            margin-left: 10px;
+            padding-top: 10px;
+        }
+
+        .mmsgLetterDesc {
+            font-size: 12px;
+            float: left;
+            height: 43px;
+            background: url('../images/mmsgletter_chat_right.gif') no-repeat right top;
+        }
+
+        .mmsgLetterDesc div {
+            white-space: nowrap;
+            float: left;
+            height: 43px;
+            padding: 0 20px;
+            line-height: 40px;
+            background: url('../images/mmsgletter_chat_left.gif') no-repeat left top;
+        }
+
+        .qmbox style,
+        .qmbox script,
+        .qmbox head,
+        .qmbox link,
+        .qmbox meta {
+            display: none !important;
+        }
+
+        #mailContentContainer .txt {
+            height: auto;
+        }
+
+        a {
+            color: #407700 !important;
+        }
+
+        .renewed {
+            color: #4882CE !important;
+        }
+
+        .notRenewed {
+            color: #EB1B2E !important;
+        }
+
+        .domainDays a {
+            color: #407700 !important;
+        }
+
+        .renewed a,
+        .notRenewed a,
+        .domainDays a {
+            /*color: inherit !important;*/
+            display: inline-block;
+            background: #ffffff;
+            min-width: 22px;
+            text-align: center;
+            padding: 4px 6px;
+            border-radius: 22px;
+            font-size: 14px;
+            font-weight: bold;
+            transition: 0.2s all ease-in-out;
+            text-decoration: none !important;
+            /*margin-right: 12px;*/
+        }
+
+        .renewed a,
+        .notRenewed a {
+            margin-right: 12px;
+        }
+
+        .renewed a {
+            color: inherit !important;
+            border: 2px solid #4882CE;
+        }
+
+        .notRenewed a {
+            color: inherit !important;
+            border: 2px solid #EB1B2E;
+        }
+
+        .domainDays a {
+            border: 2px solid #407700;
+        }
+
+        .renewed a:hover {
+            background-color: #4882CE;
+            color: #ffffff !important;
+        }
+
+        .notRenewed a:hover {
+            background-color: #EB1B2E;
+            color: #ffffff !important;
+        }
+
+        .domainDays a:hover {
+            background-color: #407700;
+            color: #ffffff !important;
+        }
+    </style>
+</head>
+<body>
+<div id="mailContentContainer" class="qmbox qm_con_body_content qqmail_webmail_only" style="">
+    <div style="background-color:#d0d0d0;background-image:url('../images/mmsgletter_2_bg.png');text-align:center;padding:40px;">
+        <div class="mmsgLetter">
+            <div class="mmsgLetterHeader" style="height:23px;"></div>
+            <div class="mmsgLetterContent"
+                 style="text-align:left;padding: 0 30px;font-size:14px;line-height:1.5;/*background:url('../images/ting.jpg') no-repeat top right;background-size: 224px 224px;*/">
+                <div>
+                    <p>
+                        %s
+                    </p>
+                </div>
+                <div class="mmsgLetterInscribe" style="padding:40px 0 0;">
+                    <img class="mmsgAvatar" src="https://q2.qlogo.cn/headimg_dl?dst_uin=593198779&spec=100"
+                         style="float:left;width:40px;height:40px;" alt="Author avatar">
+                    <div class="mmsgSender" style="margin:0 0 0 54px;">
+                        <p class="mmsgName" style="margin:0 0 10px;">Im Robot</p>
+                        <p class="mmsgInfo" style="font-size:12px;margin:0;line-height:1.2;">
+                            Freenom auto-renewal team <br>
+                            <a href="mailto:[email protected]" rel="noopener" target="_blank">[email protected]</a>
+                        </p>
+                    </div>
+                </div>
+            </div>
+            <div class="mmsgLetterFooter"
+                 style="margin:16px;text-align:center;font-size:12px;color:#888;text-shadow:1px 0px 0px #eee;"></div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

+ 380 - 0
resources/mail/en/successful_renewal.html

@@ -0,0 +1,380 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta charset="UTF-8">
+    <title>Email notification</title>
+    <style>
+        .mmsgLetter {
+            width: 580px;
+            margin: 0 auto;
+            padding: 10px;
+            color: #333;
+            background: #fff;
+            border: 0px solid #aaa;
+            border-radius: 5px;
+            -webkit-box-shadow: 3px 3px 10px #999 !important;
+            -moz-box-shadow: 3px 3px 10px #999 !important;
+            box-shadow: 3px 3px 10px #999 !important;
+            font-family: Verdana, sans-serif;
+        }
+
+        .mmsgLetter a:link,
+        .mmsgLetter a:visited {
+            color: #407700;
+        }
+
+        .mmsgLetterContent {
+            text-align: left;
+            padding: 30px;
+            font-size: 14px;
+            line-height: 1.5;
+            /*background: url('../images/ting.jpg') no-repeat top right;*/
+        }
+
+        .mmsgLetterContent h3 {
+            color: #000;
+            font-size: 20px;
+            font-weight: bold;
+            margin: 20px 0 20px;
+            border-top: 2px solid #eee;
+            padding: 20px 0 0 0;
+            font-family: "微软雅黑", "黑体", "Lucida Grande", Verdana, sans-serif;
+        }
+
+        .mmsgLetterContent p {
+            margin: 20px 0;
+            padding: 0;
+        }
+
+        .mmsgLetterContent .salutation {
+            font-weight: bold;
+        }
+
+        .mmsgLetterContent .mmsgMoreInfo {
+        }
+
+        .mmsgLetterContent a.mmsgButton {
+            display: block;
+            float: left;
+            height: 40px;
+            text-decoration: none;
+            text-align: center;
+            cursor: pointer;
+        }
+
+        .mmsgLetterContent a.mmsgButton span {
+            display: block;
+            float: left;
+            padding: 0 25px;
+            height: 40px;
+            line-height: 36px;
+            font-size: 14px;
+            font-weight: bold;
+            color: #fff;
+            text-shadow: 1px 0 0 #235e00;
+        }
+
+        .mmsgLetterContent a.mmsgButton:link,
+        .mmsgLetterContent a.mmsgButton:visited {
+            background: #338702 url('../images/mmsgletter_2_btn.png') no-repeat right -40px;
+        }
+
+        .mmsgLetterContent a.mmsgButton:link span,
+        .mmsgLetterContent a.mmsgButton:visited span {
+            background: url('../images/mmsgletter_2_btn.png') no-repeat 0 0;
+        }
+
+        .mmsgLetterContent a.mmsgButton:hover,
+        .mmsgLetterContent a.mmsgButton:active {
+            background: #338702 url('../images/mmsgletter_2_btn.png') no-repeat right -120px;
+        }
+
+        .mmsgLetterContent a.mmsgButton:hover span,
+        .mmsgLetterContent a.mmsgButton:active span {
+            background: url('../images/mmsgletter_2_btn.png') no-repeat 0 -80px;
+        }
+
+        .mmsgLetterInscribe {
+            padding: 40px 0 0;
+        }
+
+        .mmsgLetterInscribe .mmsgAvatar {
+            float: left;
+        }
+
+        .mmsgLetterInscribe .mmsgName {
+            margin: 0 0 10px;
+        }
+
+        .mmsgLetterInscribe .mmsgSender {
+            margin: 0 0 0 54px;
+        }
+
+        .mmsgLetterInscribe .mmsgInfo {
+            font-size: 12px;
+            margin: 0;
+            line-height: 1.2;
+        }
+
+        .mmsgLetterHeader {
+            height: 23px;
+            /*background: url('../images/mmsgletter_2_bg_topline.png') repeat-x 0 0;*/
+            background: 7px 0 repeat-x #FFF;
+            background-image: -webkit-repeating-linear-gradient(135deg, #4882CE, #4882CE 20px, #FFF 20px, #FFF 35px, #EB1B2E 35px, #EB1B2E 55px, #FFF 55px, #FFF 70px);
+            background-image: repeating-linear-gradient(-45deg, #4882CE, #4882CE 20px, #FFF 20px, #FFF 35px, #EB1B2E 35px, #EB1B2E 55px, #FFF 55px, #FFF 70px);
+            background-size: 110px 10px;
+        }
+
+        .mmsgLetterFooter {
+            margin: 16px;
+            text-align: center;
+            font-size: 12px;
+            color: #888;
+            text-shadow: 1px 0px 0px #eee;
+        }
+
+        .mmsgLetterClr {
+            clear: both;
+            overflow: hidden;
+            height: 1px;
+        }
+
+        .mmsgLetterUser {
+            padding: 10px 0;
+        }
+
+        .mmsgLetterUserItem {
+            padding: 0 0 20px 0;
+        }
+
+        .mmsgLetterUserAvatar {
+            height: 40px;
+            border: 1px solid #ccc;
+            padding: 2px;
+            display: block;
+            float: left;
+        }
+
+        .mmsgLetterUserAvatar img {
+            width: 40px;
+            height: 40px;
+        }
+
+        .mmsgLetterInfo {
+            margin-left: 48px;
+        }
+
+        .mmsgLetterName {
+            display: block;
+            color: #5fa207;
+            font-weight: bold;
+            margin-left: 10px;
+        }
+
+        .mmsgLetterDesc {
+            font-size: 12px;
+            float: left;
+            height: 43px;
+            background: url('../images/mmsgletter_chat_right.gif') no-repeat right top;
+        }
+
+        .mmsgLetterDesc div {
+            white-space: nowrap;
+            float: left;
+            height: 43px;
+            padding: 0 20px;
+            line-height: 40px;
+            background: url('../images/mmsgletter_chat_left.gif') no-repeat left top;
+        }
+
+        .mmsgLetterUser {
+        }
+
+        .mmsgLetterAvatar {
+            float: left;
+        }
+
+        .mmsgLetterInfo {
+            margin: 0 0 0 60px;
+        }
+
+        .mmsgLetterNickName {
+            font-size: 14px;
+            font-weight: bold;
+        }
+
+        .mmsgLetterUin {
+            font-size: 12px;
+            color: #666;
+        }
+
+        .mmsgLetterUser {
+            padding: 10px 0;
+        }
+
+        .mmsgLetterUserItem {
+            padding: 0 0 20px 0;
+        }
+
+        .mmsgLetterUserAvatar {
+            height: 40px;
+            border: 1px solid #ccc;
+            padding: 2px;
+            display: block;
+            float: left;
+        }
+
+        .mmsgLetterUserAvatar img {
+            width: 40px;
+            height: 40px;
+        }
+
+        .mmsgLetterInfo {
+            margin-left: 48px;
+        }
+
+        .mmsgLetterName {
+            display: block;
+            color: #5fa207;
+            font-weight: bold;
+            margin-left: 10px;
+            padding-top: 10px;
+        }
+
+        .mmsgLetterDesc {
+            font-size: 12px;
+            float: left;
+            height: 43px;
+            background: url('../images/mmsgletter_chat_right.gif') no-repeat right top;
+        }
+
+        .mmsgLetterDesc div {
+            white-space: nowrap;
+            float: left;
+            height: 43px;
+            padding: 0 20px;
+            line-height: 40px;
+            background: url('../images/mmsgletter_chat_left.gif') no-repeat left top;
+        }
+
+        .qmbox style,
+        .qmbox script,
+        .qmbox head,
+        .qmbox link,
+        .qmbox meta {
+            display: none !important;
+        }
+
+        #mailContentContainer .txt {
+            height: auto;
+        }
+
+        a {
+            color: #407700 !important;
+        }
+
+        .renewed {
+            color: #4882CE !important;
+        }
+
+        .notRenewed {
+            color: #EB1B2E !important;
+        }
+
+        .domainDays a {
+            color: #407700 !important;
+        }
+
+        .renewed a,
+        .notRenewed a,
+        .domainDays a {
+            /*color: inherit !important;*/
+            display: inline-block;
+            background: #ffffff;
+            min-width: 22px;
+            text-align: center;
+            padding: 4px 6px;
+            border-radius: 22px;
+            font-size: 14px;
+            font-weight: bold;
+            transition: 0.2s all ease-in-out;
+            text-decoration: none !important;
+            /*margin-right: 12px;*/
+        }
+
+        .renewed a,
+        .notRenewed a {
+            margin-right: 12px;
+        }
+
+        .renewed a {
+            color: inherit !important;
+            border: 2px solid #4882CE;
+        }
+
+        .notRenewed a {
+            color: inherit !important;
+            border: 2px solid #EB1B2E;
+        }
+
+        .domainDays a {
+            border: 2px solid #407700;
+        }
+
+        .renewed a:hover {
+            background-color: #4882CE;
+            color: #ffffff !important;
+        }
+
+        .notRenewed a:hover {
+            background-color: #EB1B2E;
+            color: #ffffff !important;
+        }
+
+        .domainDays a:hover {
+            background-color: #407700;
+            color: #ffffff !important;
+        }
+    </style>
+</head>
+<body>
+<div id="mailContentContainer" class="qmbox qm_con_body_content qqmail_webmail_only" style="">
+    <div style="background-color:#d0d0d0;background-image:url('../images/mmsgletter_2_bg.png');text-align:center;padding:40px;">
+        <div class="mmsgLetter">
+            <div class="mmsgLetterHeader" style="height:23px;"></div>
+            <div class="mmsgLetterContent"
+                 style="text-align:left;padding: 0 30px;font-size:14px;line-height:1.5;/*background:url('../images/ting.jpg') no-repeat top right;background-size: 224px 224px;*/">
+                <div>
+                    <p>Master, I just renewed your domain name!
+                        <br>
+                        <br>Account <a href="#" rel="noopener">%s</a> The results of this renewal are as follows
+                        <br><br>
+                        <span class="renewed">%s</span>
+                        <br>
+                        <span class="notRenewed">%s</span>
+                        <br>In addition, the status of other domains is as follows: <br><br><span
+                                class="domainDays">%s</span>
+                        <br><br>For more information, please refer to the <a
+                                href="https://my.freenom.com/domains.php?a=renewals" target="_blank" rel="noopener">Freenom
+                            official website</a>
+                    </p>
+                </div>
+                <div class="mmsgLetterInscribe" style="padding:40px 0 0;">
+                    <img class="mmsgAvatar" src="https://q2.qlogo.cn/headimg_dl?dst_uin=593198779&spec=100"
+                         style="float:left;width:40px;height:40px;" alt="Author avatar">
+                    <div class="mmsgSender" style="margin:0 0 0 54px;">
+                        <p class="mmsgName" style="margin:0 0 10px;">Im Robot</p>
+                        <p class="mmsgInfo" style="font-size:12px;margin:0;line-height:1.2;">
+                            Freenom auto-renewal team <br>
+                            <a href="mailto:[email protected]" rel="noopener" target="_blank">[email protected]</a>
+                        </p>
+                    </div>
+                </div>
+            </div>
+            <div class="mmsgLetterFooter"
+                 style="margin:16px;text-align:center;font-size:12px;color:#888;text-shadow:1px 0px 0px #eee;"></div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

+ 12 - 12
resources/mail/no_renewal_required.html → resources/mail/zh/no_renewal_required.html

@@ -28,7 +28,7 @@
             padding: 30px;
             font-size: 14px;
             line-height: 1.5;
-            /*background: url('images/ting.jpg') no-repeat top right;*/
+            /*background: url('../images/ting.jpg') no-repeat top right;*/
         }
 
         .mmsgLetterContent h3 {
@@ -76,22 +76,22 @@
 
         .mmsgLetterContent a.mmsgButton:link,
         .mmsgLetterContent a.mmsgButton:visited {
-            background: #338702 url('images/mmsgletter_2_btn.png') no-repeat right -40px;
+            background: #338702 url('../images/mmsgletter_2_btn.png') no-repeat right -40px;
         }
 
         .mmsgLetterContent a.mmsgButton:link span,
         .mmsgLetterContent a.mmsgButton:visited span {
-            background: url('images/mmsgletter_2_btn.png') no-repeat 0 0;
+            background: url('../images/mmsgletter_2_btn.png') no-repeat 0 0;
         }
 
         .mmsgLetterContent a.mmsgButton:hover,
         .mmsgLetterContent a.mmsgButton:active {
-            background: #338702 url('images/mmsgletter_2_btn.png') no-repeat right -120px;
+            background: #338702 url('../images/mmsgletter_2_btn.png') no-repeat right -120px;
         }
 
         .mmsgLetterContent a.mmsgButton:hover span,
         .mmsgLetterContent a.mmsgButton:active span {
-            background: url('images/mmsgletter_2_btn.png') no-repeat 0 -80px;
+            background: url('../images/mmsgletter_2_btn.png') no-repeat 0 -80px;
         }
 
         .mmsgLetterInscribe {
@@ -118,7 +118,7 @@
 
         .mmsgLetterHeader {
             height: 23px;
-            /*background: url('images/mmsgletter_2_bg_topline.png') repeat-x 0 0;*/
+            /*background: url('../images/mmsgletter_2_bg_topline.png') repeat-x 0 0;*/
             background: 7px 0 repeat-x #FFF;
             background-image: -webkit-repeating-linear-gradient(135deg, #4882CE, #4882CE 20px, #FFF 20px, #FFF 35px, #EB1B2E 35px, #EB1B2E 55px, #FFF 55px, #FFF 70px);
             background-image: repeating-linear-gradient(-45deg, #4882CE, #4882CE 20px, #FFF 20px, #FFF 35px, #EB1B2E 35px, #EB1B2E 55px, #FFF 55px, #FFF 70px);
@@ -175,7 +175,7 @@
             font-size: 12px;
             float: left;
             height: 43px;
-            background: url('images/mmsgletter_chat_right.gif') no-repeat right top;
+            background: url('../images/mmsgletter_chat_right.gif') no-repeat right top;
         }
 
         .mmsgLetterDesc div {
@@ -184,7 +184,7 @@
             height: 43px;
             padding: 0 20px;
             line-height: 40px;
-            background: url('images/mmsgletter_chat_left.gif') no-repeat left top;
+            background: url('../images/mmsgletter_chat_left.gif') no-repeat left top;
         }
 
         .mmsgLetterUser {
@@ -245,7 +245,7 @@
             font-size: 12px;
             float: left;
             height: 43px;
-            background: url('images/mmsgletter_chat_right.gif') no-repeat right top;
+            background: url('../images/mmsgletter_chat_right.gif') no-repeat right top;
         }
 
         .mmsgLetterDesc div {
@@ -254,7 +254,7 @@
             height: 43px;
             padding: 0 20px;
             line-height: 40px;
-            background: url('images/mmsgletter_chat_left.gif') no-repeat left top;
+            background: url('../images/mmsgletter_chat_left.gif') no-repeat left top;
         }
 
         .qmbox style,
@@ -334,10 +334,10 @@
 </head>
 <body>
 <div id="mailContentContainer" class="qmbox qm_con_body_content qqmail_webmail_only" style="">
-    <div style="background-color:#d0d0d0;background-image:url('images/mmsgletter_2_bg.png');text-align:center;padding:40px;">
+    <div style="background-color:#d0d0d0;background-image:url('../images/mmsgletter_2_bg.png');text-align:center;padding:40px;">
         <div class="mmsgLetter">
             <div class="mmsgLetterHeader" style="height:23px;"></div>
-            <div class="mmsgLetterContent" style="text-align:left;padding: 0 30px;font-size:14px;line-height:1.5;/*background:url('images/ting.jpg') no-repeat top right;background-size: 224px 224px;*/">
+            <div class="mmsgLetterContent" style="text-align:left;padding: 0 30px;font-size:14px;line-height:1.5;/*background:url('../images/ting.jpg') no-repeat top right;background-size: 224px 224px;*/">
                 <div>
                     <p>
                         <br>我刚刚帮小主看了一下,账户 <a href="#" rel="noopener">%s</a> 今天并没有需要续期的域名。所有域名情况如下:

+ 12 - 12
resources/mail/notice.html → resources/mail/zh/notice.html

@@ -28,7 +28,7 @@
             padding: 30px;
             font-size: 14px;
             line-height: 1.5;
-            /*background: url('images/ting.jpg') no-repeat top right;*/
+            /*background: url('../images/ting.jpg') no-repeat top right;*/
         }
 
         .mmsgLetterContent h3 {
@@ -76,22 +76,22 @@
 
         .mmsgLetterContent a.mmsgButton:link,
         .mmsgLetterContent a.mmsgButton:visited {
-            background: #338702 url('images/mmsgletter_2_btn.png') no-repeat right -40px;
+            background: #338702 url('../images/mmsgletter_2_btn.png') no-repeat right -40px;
         }
 
         .mmsgLetterContent a.mmsgButton:link span,
         .mmsgLetterContent a.mmsgButton:visited span {
-            background: url('images/mmsgletter_2_btn.png') no-repeat 0 0;
+            background: url('../images/mmsgletter_2_btn.png') no-repeat 0 0;
         }
 
         .mmsgLetterContent a.mmsgButton:hover,
         .mmsgLetterContent a.mmsgButton:active {
-            background: #338702 url('images/mmsgletter_2_btn.png') no-repeat right -120px;
+            background: #338702 url('../images/mmsgletter_2_btn.png') no-repeat right -120px;
         }
 
         .mmsgLetterContent a.mmsgButton:hover span,
         .mmsgLetterContent a.mmsgButton:active span {
-            background: url('images/mmsgletter_2_btn.png') no-repeat 0 -80px;
+            background: url('../images/mmsgletter_2_btn.png') no-repeat 0 -80px;
         }
 
         .mmsgLetterInscribe {
@@ -118,7 +118,7 @@
 
         .mmsgLetterHeader {
             height: 23px;
-            /*background: url('images/mmsgletter_2_bg_topline.png') repeat-x 0 0;*/
+            /*background: url('../images/mmsgletter_2_bg_topline.png') repeat-x 0 0;*/
             background: 7px 0 repeat-x #FFF;
             background-image: -webkit-repeating-linear-gradient(135deg, #4882CE, #4882CE 20px, #FFF 20px, #FFF 35px, #EB1B2E 35px, #EB1B2E 55px, #FFF 55px, #FFF 70px);
             background-image: repeating-linear-gradient(-45deg, #4882CE, #4882CE 20px, #FFF 20px, #FFF 35px, #EB1B2E 35px, #EB1B2E 55px, #FFF 55px, #FFF 70px);
@@ -175,7 +175,7 @@
             font-size: 12px;
             float: left;
             height: 43px;
-            background: url('images/mmsgletter_chat_right.gif') no-repeat right top;
+            background: url('../images/mmsgletter_chat_right.gif') no-repeat right top;
         }
 
         .mmsgLetterDesc div {
@@ -184,7 +184,7 @@
             height: 43px;
             padding: 0 20px;
             line-height: 40px;
-            background: url('images/mmsgletter_chat_left.gif') no-repeat left top;
+            background: url('../images/mmsgletter_chat_left.gif') no-repeat left top;
         }
 
         .mmsgLetterUser {
@@ -245,7 +245,7 @@
             font-size: 12px;
             float: left;
             height: 43px;
-            background: url('images/mmsgletter_chat_right.gif') no-repeat right top;
+            background: url('../images/mmsgletter_chat_right.gif') no-repeat right top;
         }
 
         .mmsgLetterDesc div {
@@ -254,7 +254,7 @@
             height: 43px;
             padding: 0 20px;
             line-height: 40px;
-            background: url('images/mmsgletter_chat_left.gif') no-repeat left top;
+            background: url('../images/mmsgletter_chat_left.gif') no-repeat left top;
         }
 
         .qmbox style,
@@ -334,10 +334,10 @@
 </head>
 <body>
 <div id="mailContentContainer" class="qmbox qm_con_body_content qqmail_webmail_only" style="">
-    <div style="background-color:#d0d0d0;background-image:url('images/mmsgletter_2_bg.png');text-align:center;padding:40px;">
+    <div style="background-color:#d0d0d0;background-image:url('../images/mmsgletter_2_bg.png');text-align:center;padding:40px;">
         <div class="mmsgLetter">
             <div class="mmsgLetterHeader" style="height:23px;"></div>
-            <div class="mmsgLetterContent" style="text-align:left;padding: 0 30px;font-size:14px;line-height:1.5;/*background:url('images/ting.jpg') no-repeat top right;background-size: 224px 224px;*/">
+            <div class="mmsgLetterContent" style="text-align:left;padding: 0 30px;font-size:14px;line-height:1.5;/*background:url('../images/ting.jpg') no-repeat top right;background-size: 224px 224px;*/">
                 <div>
                     <p>
                         %s

+ 12 - 12
resources/mail/successful_renewal.html → resources/mail/zh/successful_renewal.html

@@ -28,7 +28,7 @@
             padding: 30px;
             font-size: 14px;
             line-height: 1.5;
-            /*background: url('images/ting.jpg') no-repeat top right;*/
+            /*background: url('../images/ting.jpg') no-repeat top right;*/
         }
 
         .mmsgLetterContent h3 {
@@ -76,22 +76,22 @@
 
         .mmsgLetterContent a.mmsgButton:link,
         .mmsgLetterContent a.mmsgButton:visited {
-            background: #338702 url('images/mmsgletter_2_btn.png') no-repeat right -40px;
+            background: #338702 url('../images/mmsgletter_2_btn.png') no-repeat right -40px;
         }
 
         .mmsgLetterContent a.mmsgButton:link span,
         .mmsgLetterContent a.mmsgButton:visited span {
-            background: url('images/mmsgletter_2_btn.png') no-repeat 0 0;
+            background: url('../images/mmsgletter_2_btn.png') no-repeat 0 0;
         }
 
         .mmsgLetterContent a.mmsgButton:hover,
         .mmsgLetterContent a.mmsgButton:active {
-            background: #338702 url('images/mmsgletter_2_btn.png') no-repeat right -120px;
+            background: #338702 url('../images/mmsgletter_2_btn.png') no-repeat right -120px;
         }
 
         .mmsgLetterContent a.mmsgButton:hover span,
         .mmsgLetterContent a.mmsgButton:active span {
-            background: url('images/mmsgletter_2_btn.png') no-repeat 0 -80px;
+            background: url('../images/mmsgletter_2_btn.png') no-repeat 0 -80px;
         }
 
         .mmsgLetterInscribe {
@@ -118,7 +118,7 @@
 
         .mmsgLetterHeader {
             height: 23px;
-            /*background: url('images/mmsgletter_2_bg_topline.png') repeat-x 0 0;*/
+            /*background: url('../images/mmsgletter_2_bg_topline.png') repeat-x 0 0;*/
             background: 7px 0 repeat-x #FFF;
             background-image: -webkit-repeating-linear-gradient(135deg, #4882CE, #4882CE 20px, #FFF 20px, #FFF 35px, #EB1B2E 35px, #EB1B2E 55px, #FFF 55px, #FFF 70px);
             background-image: repeating-linear-gradient(-45deg, #4882CE, #4882CE 20px, #FFF 20px, #FFF 35px, #EB1B2E 35px, #EB1B2E 55px, #FFF 55px, #FFF 70px);
@@ -175,7 +175,7 @@
             font-size: 12px;
             float: left;
             height: 43px;
-            background: url('images/mmsgletter_chat_right.gif') no-repeat right top;
+            background: url('../images/mmsgletter_chat_right.gif') no-repeat right top;
         }
 
         .mmsgLetterDesc div {
@@ -184,7 +184,7 @@
             height: 43px;
             padding: 0 20px;
             line-height: 40px;
-            background: url('images/mmsgletter_chat_left.gif') no-repeat left top;
+            background: url('../images/mmsgletter_chat_left.gif') no-repeat left top;
         }
 
         .mmsgLetterUser {
@@ -245,7 +245,7 @@
             font-size: 12px;
             float: left;
             height: 43px;
-            background: url('images/mmsgletter_chat_right.gif') no-repeat right top;
+            background: url('../images/mmsgletter_chat_right.gif') no-repeat right top;
         }
 
         .mmsgLetterDesc div {
@@ -254,7 +254,7 @@
             height: 43px;
             padding: 0 20px;
             line-height: 40px;
-            background: url('images/mmsgletter_chat_left.gif') no-repeat left top;
+            background: url('../images/mmsgletter_chat_left.gif') no-repeat left top;
         }
 
         .qmbox style,
@@ -334,10 +334,10 @@
 </head>
 <body>
 <div id="mailContentContainer" class="qmbox qm_con_body_content qqmail_webmail_only" style="">
-    <div style="background-color:#d0d0d0;background-image:url('images/mmsgletter_2_bg.png');text-align:center;padding:40px;">
+    <div style="background-color:#d0d0d0;background-image:url('../images/mmsgletter_2_bg.png');text-align:center;padding:40px;">
         <div class="mmsgLetter">
             <div class="mmsgLetterHeader" style="height:23px;"></div>
-            <div class="mmsgLetterContent" style="text-align:left;padding: 0 30px;font-size:14px;line-height:1.5;/*background:url('images/ting.jpg') no-repeat top right;background-size: 224px 224px;*/">
+            <div class="mmsgLetterContent" style="text-align:left;padding: 0 30px;font-size:14px;line-height:1.5;/*background:url('../images/ting.jpg') no-repeat top right;background-size: 224px 224px;*/">
                 <div>
                     <p>主人,我刚刚帮你续期域名啦~
                         <br>

+ 10 - 9
run

@@ -50,8 +50,9 @@ use Luolongfei\Libs\Message;
 function customize_error_handler()
 {
     if (!is_null($error = error_get_last())) {
-        Log::error('程序意外终止', $error);
-        Message::send('可能存在错误,这边收集到的错误信息为:' . json_encode($error, JSON_UNESCAPED_UNICODE), '主人,程序意外终止');
+        system_log(json_encode($error, JSON_UNESCAPED_UNICODE));
+        Log::error(lang('100057'), $error);
+        Message::send(lang('100058') . json_encode($error, JSON_UNESCAPED_UNICODE), lang('100059'));
     }
 }
 
@@ -62,8 +63,8 @@ function customize_error_handler()
  */
 function exception_handler($e)
 {
-    Log::error('未捕获的异常:' . $e->getMessage());
-    Message::send("具体的异常内容是:\n" . $e->getMessage(), '主人,未捕获的异常');
+    Log::error(lang('100060') . $e->getMessage());
+    Message::send(lang('100061') . $e->getMessage(), lang('100062'));
 }
 
 /**
@@ -90,7 +91,7 @@ function main_handler($event, $context)
 function handler($event, $context)
 {
     $logger = $GLOBALS['fcLogger'];
-    $logger->info('开始执行阿里云函数');
+    $logger->info(lang('100063'));
 
     return run();
 }
@@ -108,13 +109,13 @@ function run()
 
         $class::getInstance()->$fn();
 
-        return IS_SCF ? '云函数执行成功。' : true;
+        return IS_SCF ? lang('100007') : true;
     } catch (\Exception $e) {
-        system_log(sprintf('执行出错:<red>%s</red>', $e->getMessage()), $e->getTrace());
-        Message::send("执行出错:\n" . $e->getMessage(), '主人,捕获异常');
+        system_log(sprintf(lang('100006'), $e->getMessage()), $e->getTrace());
+        Message::send(lang('100004') . $e->getMessage(), lang('100005'));
     }
 
-    return IS_SCF ? '云函数执行失败。' : false;
+    return IS_SCF ? lang('100008') : false;
 }
 
 run();

+ 1 - 1
vendor/bramus/ansi-php/.gitignore

@@ -1 +1 @@
-vendor
+vendor

+ 11 - 11
vendor/bramus/ansi-php/.travis.yml

@@ -1,12 +1,12 @@
-language: php
-
-dist: trusty
-
-php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-
+language: php
+
+dist: trusty
+
+php:
+  - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
+  - 7.3
+
 before_script: composer install

+ 18 - 18
vendor/bramus/ansi-php/LICENSE

@@ -1,19 +1,19 @@
-Copyright Bram(us) Van Damme - https://www.bram.us/
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+Copyright Bram(us) Van Damme - https://www.bram.us/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.

+ 26 - 26
vendor/bramus/ansi-php/composer.json

@@ -1,26 +1,26 @@
-{
-    "name": "bramus/ansi-php",
-    "description": "ANSI Control Functions and ANSI Control Sequences (Colors, Erasing, etc.) for PHP CLI Apps",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Bramus Van Damme",
-            "email": "[email protected]",
-            "homepage": "https://www.bram.us/"
-        }
-    ],
-    "require": {
-        "php": ">=5.4.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Bramus\\Ansi\\": "src/"
-        }
-    },
-    "scripts": {
-        "test": "vendor/bin/phpunit"
-    }
-}
+{
+    "name": "bramus/ansi-php",
+    "description": "ANSI Control Functions and ANSI Control Sequences (Colors, Erasing, etc.) for PHP CLI Apps",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Bramus Van Damme",
+            "email": "[email protected]",
+            "homepage": "https://www.bram.us/"
+        }
+    ],
+    "require": {
+        "php": ">=5.4.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Bramus\\Ansi\\": "src/"
+        }
+    },
+    "scripts": {
+        "test": "vendor/bin/phpunit"
+    }
+}

+ 1199 - 1199
vendor/bramus/ansi-php/composer.lock

@@ -1,1199 +1,1199 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "2bd803cd6028d92b2de740f9bff2af1d",
-    "packages": [],
-    "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "[email protected]",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2015-06-14T21:17:01+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2017-09-11T18:02:19+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "3.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2",
-                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0",
-                "phpdocumentor/type-resolver": "^0.4.0",
-                "webmozart/assert": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^4.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-10T14:09:06+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "0.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "[email protected]"
-                }
-            ],
-            "time": "2017-07-14T14:27:02+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "1.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0|^3.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "[email protected]",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2018-08-05T17:53:17+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "^1.3.2",
-                "sebastian/version": "~1.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-10-06T15:47:00+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2017-11-27T13:52:08+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21T13:50:34+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2017-02-26T11:10:40+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16",
-                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2017-12-04T08:55:13+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "4.8.36",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "46023de9a91eec7dfb06cc56cb4e260017298517"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517",
-                "reference": "46023de9a91eec7dfb06cc56cb4e260017298517",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "~2.1",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "~2.3",
-                "sebastian/comparator": "~1.2.2",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "~1.3",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.1|~3.0"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.8.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2017-06-21T08:07:12+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2015-10-02T06:51:40+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2 || ~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2017-01-29T09:50:25+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.4.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2017-05-22T07:24:03+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
-                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8 || ^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2016-08-18T05:49:44+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2016-06-17T09:04:28+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2015-10-12T03:26:01+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2016-10-03T07:41:43+00:00"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "1.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "[email protected]",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21T13:59:46+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                },
-                {
-                    "name": "Gert de Pagter",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "time": "2018-08-06T14:22:27+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v3.4.22",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/ba11776e9e6c15ad5759a07bffb15899bac75c2d",
-                "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/console": "<3.4"
-            },
-            "require-dev": {
-                "symfony/console": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-01-16T10:59:17+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2018-12-25T11:19:39+00:00"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.4.0"
-    },
-    "platform-dev": []
-}
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "2bd803cd6028d92b2de740f9bff2af1d",
+    "packages": [],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "[email protected]",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14T21:17:01+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2017-09-11T18:02:19+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "3.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2",
+                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0",
+                "phpdocumentor/reflection-common": "^1.0.0",
+                "phpdocumentor/type-resolver": "^0.4.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2017-11-10T14:09:06+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "[email protected]"
+                }
+            ],
+            "time": "2017-07-14T14:27:02+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+                "sebastian/comparator": "^1.1|^2.0|^3.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "[email protected]",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2018-08-05T17:53:17+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "2.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "^1.3.2",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-10-06T15:47:00+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2017-11-27T13:52:08+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2017-02-26T11:10:40+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16",
+                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2017-12-04T08:55:13+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "4.8.36",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "46023de9a91eec7dfb06cc56cb4e260017298517"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517",
+                "reference": "46023de9a91eec7dfb06cc56cb4e260017298517",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpspec/prophecy": "^1.3.1",
+                "phpunit/php-code-coverage": "~2.1",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "^1.0.6",
+                "phpunit/phpunit-mock-objects": "~2.3",
+                "sebastian/comparator": "~1.2.2",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "~1.3",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.8.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-06-21T08:07:12+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2015-10-02T06:51:40+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2 || ~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2017-01-29T09:50:25+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2017-05-22T07:24:03+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8 || ^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-08-18T05:49:44+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2016-06-17T09:04:28+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12T03:26:01+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2016-10-03T07:41:43+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2015-06-21T13:59:46+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                },
+                {
+                    "name": "Gert de Pagter",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "time": "2018-08-06T14:22:27+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v3.4.22",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/ba11776e9e6c15ad5759a07bffb15899bac75c2d",
+                "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "conflict": {
+                "symfony/console": "<3.4"
+            },
+            "require-dev": {
+                "symfony/console": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2019-01-16T10:59:17+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2018-12-25T11:19:39+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.4.0"
+    },
+    "platform-dev": []
+}

+ 13 - 13
vendor/bramus/ansi-php/phpunit.xml.dist

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" syntaxCheck="false" bootstrap="tests/bootstrap.php">
-	<testsuites>
-		<testsuite name="Ansi Tests">
-			<directory>tests/</directory>
-		</testsuite>
-	</testsuites>
-	<filter>
-		<whitelist>
-			<directory suffix=".php">src/</directory>
-		</whitelist>
-	</filter>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" syntaxCheck="false" bootstrap="tests/bootstrap.php">
+	<testsuites>
+		<testsuite name="Ansi Tests">
+			<directory>tests/</directory>
+		</testsuite>
+	</testsuites>
+	<filter>
+		<whitelist>
+			<directory suffix=".php">src/</directory>
+		</whitelist>
+	</filter>
 </phpunit>

+ 390 - 337
vendor/bramus/ansi-php/readme.md

@@ -1,337 +1,390 @@
-# ANSI PHP
-
-[![Build Status](https://img.shields.io/travis/bramus/ansi-php.svg?style=flat-square)](http://travis-ci.org/bramus/ansi-php) [![Source](http://img.shields.io/badge/source-bramus/ansi--php-blue.svg?style=flat-square)](https://github.com/bramus/ansi-php) [![Version](https://img.shields.io/packagist/v/bramus/ansi-php.svg?style=flat-square)](https://packagist.org/packages/bramus/ansi-php) [![Downloads](https://img.shields.io/packagist/dt/bramus/ansi-php.svg?style=flat-square)](https://packagist.org/packages/bramus/ansi-php/stats) [![License](https://img.shields.io/packagist/l/bramus/ansi-php.svg?style=flat-square)](https://github.com/bramus/ansi-php/blob/master/LICENSE)
-
-ANSI Control Functions and ANSI Control Sequences for PHP CLI Apps
-
-Built by Bramus! - [https://www.bram.us/](https://www.bram.us/)
-
-## About
-
-`bramus/ansi-php` is a set of classes to working with ANSI Control Functions and ANSI Control Sequences on text based terminals.
-
-- ANSI Control Functions control an action such as line spacing, paging, or data flow.
-- ANSI Control Sequences allow one to clear the screen, move the cursor, set text colors, etc.
-
-_(Sidenote: An “ANSI Escape Sequence” is a special type of “ANSI Control Sequence” which starts with the ESC ANSI Control Function. The terms are not interchangeable.)_
-
-## Features
-
-When it comes to ANSI Control Functions `bramus/ansi-php` supports:
-
-- `BS`: Backspace
-- `BEL`: Bell
-- `CR`: Carriage Return
-- `ESC`: Escape
-- `LF`: Line Feed
-- `TAB`: Tab
-
-When it comes to ANSI Escape Sequences `bramus/ansi-php` supports:
-
-- SGR _(Select Graphic Rendition)_: Manipulate text styling (bold, underline, blink, colors, etc.).
-- ED _(Erase Display)_: Erase (parts of) the display.
-- EL _(Erase In Line)_: Erase (parts of) the current line.
-
-Other Control Sequences – such as moving the cursor – are not (yet) supported.
-
-An example library that uses `bramus/ansi-php` is [`bramus/monolog-colored-line-formatter`](https://github.com/bramus/monolog-colored-line-formatter). It uses `bramus/ansi-php`'s SGR support to colorize the output:
-
-![Monolog Colored Line Formatter](https://user-images.githubusercontent.com/11269635/28756233-c9f63abe-756a-11e7-883f-a084f35c55e7.gif)
-
-## Prerequisites/Requirements
-
-- PHP 5.4.0 or greater
-
-## Installation
-
-Installation is possible using Composer
-
-```shell
-composer require bramus/ansi-php ~3.0
-```
-
-## Usage
-
-The easiest way to use _ANSI PHP_ is to use the bundled `Ansi` helper class which provides easy shorthands to working with `bramus/ansi-php`. The `Ansi` class is written in such a way that you can chain calls to one another.
-
-If you're feeling adventurous, you're of course free to use the raw `ControlFunction` and `ControlSequence` classes.
-
-### Quick example
-
-```php
-use \Bramus\Ansi\Ansi;
-use \Bramus\Ansi\Writers\StreamWriter;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR;
-
-// Create Ansi Instance
-$ansi = new Ansi(new StreamWriter('php://stdout'));
-
-// Output some styled text on screen, along with a Line Feed and a Bell
-$ansi->color(array(SGR::COLOR_FG_RED, SGR::COLOR_BG_WHITE))
-     ->blink()
-     ->text('I will be blinking red on a white background.')
-     ->nostyle()
-     ->text(' And I will be normally styled.')
-     ->lf()
-     ->text('Ooh, a bell is coming ...')
-     ->bell();
-```
-
-See more examples further down on how to use these.
-
-## Concepts
-
-Since v3.0 `bramus/ansi-php` uses the concept of writers to write the data to. By default a `StreamWriter` writing to `php://stdout` is used.
-
-The following writers are provided
-
-- `StreamWriter`: Writes the data to a stream. Just pass in the path to a file and it will open a stream for you. Defaults to writing to `php://stdout`.
-- `BufferWriter`: Writes the data to a buffer. When calling `flush()` the contents of the buffer will be returned.
-- `ProxyWriter`: Acts as a proxy to another writer. Writes the data to an internal buffer. When calling `flush()` the writer will first write the data to the other writer before returning it.
-
-## The `Ansi` helper class functions
-
-### Core functions:
-
-- `text($text)`: Write a piece of data to the writer
-- `setWriter(\Bramus\Ansi\Writers\WriterInterface $writer)`: Sets the writer
-- `getWriter()`: Gets the writer
-
-### ANSI Control Function shorthands:
-
-These shorthands write a Control Character to the writer.
-
-- `bell()`:  Bell Control Character (`\a`)
-- `backspace()`:  Backspace Control Character (`\b`)
-- `tab()`:  Tab Control Character (`\t`)
-- `lf()`:  Line Feed Control Character (`\n`)
-- `cr()`:  Carriage Return Control Character (`\r`)
-- `esc()`:  Escape Control Character
-
-### SGR ANSI Escape Sequence shorthands:
-
-These shorthands write SGR ANSI Escape Sequences to the writer.
-
-- `nostyle()` or `reset()`: Remove all text styling (colors, bold, etc)
-- `color()`: Set the foreground and/or backgroundcolor of the text. _(see further)_
-- `bold()` or `bright()`: Bold: On. On some systems "Intensity: Bright"
-- `normal()`: Bold: Off. On some systems "Intensity: Normal"
-- `faint()`: Intensity: Faint. _(Not widely supported)_
-- `italic()`: Italic: On. _(Not widely supported)_
-- `underline()`: Underline: On.
-- `blink()`: Blink: On.
-- `negative()`: Inverse or Reverse. Swap foreground and background.
-- `strikethrough()`: Strikethrough: On. _(Not widely supported)_
-
-__IMPORTANT:__ Select Graphic Rendition works in such a way that text styling  you have set will remain active until you call `nostyle()` or `reset()` to return to the default styling.
-
-### ED ANSI Escape Sequence shorthands:
-
-These shorthands write ED ANSI Escape Sequences to the writer.
-
-- `eraseDisplay()`: Erase the entire screen and moves the cursor to home.
-- `eraseDisplayUp()`: Erase the screen from the current line up to the top of the screen.
-- `eraseDisplayDown()`: Erase the screen from the current line down to the bottom of the screen.
-
-### EL ANSI Escape Sequence shorthands:
-
-These shorthands write EL ANSI Escape Sequences to the writer.
-
-- `eraseLine()`: Erase the entire current line.
-- `eraseLineToEOL()`: Erase from the current cursor position to the end of the current line.
-- `eraseLineToSOL()`: Erases from the current cursor position to the start of the current line.
-
-### Extra functions
-
-- `flush()` or `get()`: Retrieve contents of a `FlushableWriter` writer.
-- `e()`: Echo the contents of a `FlushableWriter` writer.
-
-## Examples
-
-### The Basics
-
-```php
-// Create Ansi Instance
-$ansi = new \Bramus\Ansi\Ansi();
-
-// This will output a Bell
-$ansi->bell();
-
-// This will output some text
-$ansi->text('Hello World!');
-```
-
-_NOTE:_ As no `$writer` is passed into the constructor of `\Bramus\Ansi\Ansi`, the default `StreamWriter` writing to `php://stdout` is used.
-
-### Using a `FlushableWriter`
-
-Flushable Writers are writers that cache the data and only output it when flushed using its `flush()` function. The `BufferWriter` and `ProxyWriter` implement this interface.
-
-```php
-// Create Ansi Instance
-$ansi = new \Bramus\Ansi\Ansi(new \Bramus\Ansi\Writers\BufferWriter());
-
-// This will append a bell to the buffer. It will not output it.
-$ansi->bell();
-
-// This will append a bell to the buffer. It will not output it.
-$ansi->text('Hello World!');
-
-// Now we'll output it
-echo $ansi->get();
-```
-
-### Chaining
-
-`bramus/ansi-php`'s wrapper `Ansi` class supports chaining.
-
-```php
-// Create Ansi Instance
-$ansi = new \Bramus\Ansi\Ansi();
-
-// This will output a Line Feed, some text, a Bell, and a Line Feed
-$ansi->lf()->text('hello')->bell()->lf();
-
-```
-
-### Styling Text: The Basics
-
-```php
-$ansi = new \Bramus\Ansi\Ansi();
-$ansi->bold()->underline()->text('I will be bold and underlined')->lf();
-```
-
-__IMPORTANT__ Select Graphic Rendition works in such a way that text styling  you have set will remain active until you call `nostyle()` or `reset()` to return to the default styling.
-
-
-```php
-$ansi = new \Bramus\Ansi\Ansi();
-
-$ansi->bold()->underline()->text('I will be bold and underlined')->lf();
-$ansi->text('I will also be bold because nostyle() has not been called yet')->lf();
-$ansi->nostyle()->blink()->text('I will be blinking')->nostyle()->lf();
-$ansi->text('I will be normal because nostyle() was called on the previous line');
-
-```
-
-### Styling Text: Colors
-
-Colors, and other text styling options, are defined as contants on `\Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR`.
-
-#### Foreground (Text) Colors
-
-- `SGR::COLOR_FG_BLACK`: Black Foreground Color
-- `SGR::COLOR_FG_RED`: Red Foreground Color
-- `SGR::COLOR_FG_GREEN`: Green Foreground Color
-- `SGR::COLOR_FG_YELLOW`: Yellow Foreground Color
-- `SGR::COLOR_FG_BLUE`: Blue Foreground Color
-- `SGR::COLOR_FG_PURPLE`: Purple Foreground Color
-- `SGR::COLOR_FG_CYAN`: Cyan Foreground Color
-- `SGR::COLOR_FG_WHITE`: White Foreground Color
-- `SGR::COLOR_FG_BLACK_BRIGHT`: Black Foreground Color (Bright)
-- `SGR::COLOR_FG_RED_BRIGHT`: Red Foreground Color (Bright)
-- `SGR::COLOR_FG_GREEN_BRIGHT`: Green Foreground Color (Bright)
-- `SGR::COLOR_FG_YELLOW_BRIGHT`: Yellow Foreground Color (Bright)
-- `SGR::COLOR_FG_BLUE_BRIGHT`: Blue Foreground Color (Bright)
-- `SGR::COLOR_FG_PURPLE_BRIGHT`: Purple Foreground Color (Bright)
-- `SGR::COLOR_FG_CYAN_BRIGHT`: Cyan Foreground Color (Bright)
-- `SGR::COLOR_FG_WHITE_BRIGHT`: White Foreground Color (Bright)
-- `SGR::COLOR_FG_RESET`: Default Foreground Color
-
-#### Background Colors
-
-- `SGR::COLOR_BG_BLACK`: Black Background Color
-- `SGR::COLOR_BG_RED`: Red Background Color
-- `SGR::COLOR_BG_GREEN`: Green Background Color
-- `SGR::COLOR_BG_YELLOW`: Yellow Background Color
-- `SGR::COLOR_BG_BLUE`: Blue Background Color
-- `SGR::COLOR_BG_PURPLE`: Purple Background Color
-- `SGR::COLOR_BG_CYAN`: Cyan Background Color
-- `SGR::COLOR_BG_WHITE`: White Background Color
-- `SGR::COLOR_BG_BLACK_BRIGHT`: Black Background Color (Bright)
-- `SGR::COLOR_BG_RED_BRIGHT`: Red Background Color (Bright)
-- `SGR::COLOR_BG_GREEN_BRIGHT`: Green Background Color (Bright)
-- `SGR::COLOR_BG_YELLOW_BRIGHT`: Yellow Background Color (Bright)
-- `SGR::COLOR_BG_BLUE_BRIGHT`: Blue Background Color (Bright)
-- `SGR::COLOR_BG_PURPLE_BRIGHT`: Purple Background Color (Bright)
-- `SGR::COLOR_BG_CYAN_BRIGHT`: Cyan Background Color (Bright)
-- `SGR::COLOR_BG_WHITE_BRIGHT`: White Background Color (Bright)
-- `SGR::COLOR_BG_RESET`: Default Background Color
-
-Pass one of these into `$ansi->color()` and the color will be set.
-
-```php
-use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR;
-
-$ansi = new \Bramus\Ansi\Ansi();
-
-$ansi->color(SGR::COLOR_FG_RED)
-     ->text('I will be red')
-     ->nostyle();
-```
-
-To set the foreground and background color in one call, pass them using an array to `$ansi->color()`
-
-```php
-use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR;
-
-$ansi = new \Bramus\Ansi\Ansi();
-
-$ansi->color(array(SGR::COLOR_FG_RED, SGR::COLOR_BG_WHITE))
-     ->blink()
-     ->text('I will be blinking red on a wrhite background.')
-     ->nostyle();
-```
-
-### Using the raw classes
-
-As all raw `ControlFunction` and `ControlSequence` classes are provided with a `__toString()` function it's perfectly possible to directly `echo` some `bramus/ansi-php` instance.
-
-```php
-// Output a Bell Control Character
-echo new \Bramus\Ansi\ControlFunctions\Bell();
-
-// Output an ED instruction, to erase the entire screen
-echo new \Bramus\Ansi\ControlSequences\EscapeSequences\ED(
-    \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\ED::ALL
-);
-```
-
-To fetch their contents, use the `get()` function:
-
-```php
-// Get ANSI string for a Bell Control Character
-$bell = (new \Bramus\Ansi\ControlFunctions\Bell())->get();
-
-// Get ANSI string for an ED instruction, to erase the entire screen
-$eraseDisplay = (new \Bramus\Ansi\ControlSequences\EscapeSequences\ED(
-    \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\ED::ALL
-))->get();
-
-echo $bell . $bell . $eraseDisplay . $bell;
-```
-
-## Unit Testing
-
-`bramus/ansi-php` ships with unit tests using [PHPUnit](https://github.com/sebastianbergmann/phpunit/).
-
-- If PHPUnit is installed globally run `phpunit` to run the tests.
-
-- If PHPUnit is not installed globally, install it locally throuh composer by running `composer install --dev`. Run the tests themselves by calling `vendor/bin/phpunit` or `composer test`
-
-Unit tests are also automatically run [on Travis CI](http://travis-ci.org/bramus/ansi-php)
-
-## License
-
-`bramus/ansi-php` is released under the MIT public license. See the enclosed `LICENSE` for details.
-
-## ANSI References
-
-- [http://en.wikipedia.org/wiki/ANSI_escape_code](http://en.wikipedia.org/wiki/ANSI_escape_code)
-- [http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-048.pdf](http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-048.pdf)
-- [http://wiki.bash-hackers.org/scripting/terminalcodes](http://wiki.bash-hackers.org/scripting/terminalcodes)
-- [http://web.mit.edu/gnu/doc/html/screen_10.html](http://web.mit.edu/gnu/doc/html/screen_10.html)
-- [http://www.isthe.com/chongo/tech/comp/ansi_escapes.html](http://www.isthe.com/chongo/tech/comp/ansi_escapes.html)
-- [http://www.termsys.demon.co.uk/vtansi.htm](http://www.termsys.demon.co.uk/vtansi.htm)
-- [http://rrbrandt.dee.ufcg.edu.br/en/docs/ansi/](http://rrbrandt.dee.ufcg.edu.br/en/docs/ansi/)
-- [http://tldp.org/HOWTO/Bash-Prompt-HOWTO/c327.html](http://tldp.org/HOWTO/Bash-Prompt-HOWTO/c327.html)
+# ANSI PHP
+
+[![Build Status](https://img.shields.io/travis/bramus/ansi-php.svg?style=flat-square)](http://travis-ci.org/bramus/ansi-php) [![Source](http://img.shields.io/badge/source-bramus/ansi--php-blue.svg?style=flat-square)](https://github.com/bramus/ansi-php) [![Version](https://img.shields.io/packagist/v/bramus/ansi-php.svg?style=flat-square)](https://packagist.org/packages/bramus/ansi-php) [![Downloads](https://img.shields.io/packagist/dt/bramus/ansi-php.svg?style=flat-square)](https://packagist.org/packages/bramus/ansi-php/stats) [![License](https://img.shields.io/packagist/l/bramus/ansi-php.svg?style=flat-square)](https://github.com/bramus/ansi-php/blob/master/LICENSE)
+
+ANSI Control Functions and ANSI Control Sequences for PHP CLI Apps
+
+Built by Bramus! - [https://www.bram.us/](https://www.bram.us/)
+
+## About
+
+`bramus/ansi-php` is a set of classes to working with ANSI Control Functions and ANSI Control Sequences on text based terminals.
+
+- ANSI Control Functions control an action such as line spacing, paging, or data flow.
+- ANSI Control Sequences allow one to clear the screen, move the cursor, set text colors, etc.
+
+_(Sidenote: An “ANSI Escape Sequence” is a special type of “ANSI Control Sequence” which starts with the ESC ANSI Control Function. The terms are not interchangeable.)_
+
+## Features
+
+When it comes to ANSI Control Functions `bramus/ansi-php` supports:
+
+- `BS`: Backspace
+- `BEL`: Bell
+- `CR`: Carriage Return
+- `ESC`: Escape
+- `LF`: Line Feed
+- `TAB`: Tab
+
+When it comes to ANSI Escape Sequences `bramus/ansi-php` supports:
+
+- CUB _(Cursor Back)_: Move cursor back.
+- CUD _(Cursor Down)_: Move cursor down.
+- CUF _(Cursor Forward)_: Move cursor forward.
+- CUP _(Cursor Position)_: Move cursor to position.
+- CUU _(Cursor Up)_: Move cursor up.
+- ED _(Erase Display)_: Erase (parts of) the display.
+- EL _(Erase In Line)_: Erase (parts of) the current line.
+- SGR _(Select Graphic Rendition)_: Manipulate text styling (bold, underline, blink, colors, etc.).
+
+Other Control Sequences – such as DCH, NEL, etc. – are not (yet) supported.
+
+An example library that uses `bramus/ansi-php` is [`bramus/monolog-colored-line-formatter`](https://github.com/bramus/monolog-colored-line-formatter). It uses `bramus/ansi-php`'s SGR support to colorize the output:
+
+![Monolog Colored Line Formatter](https://user-images.githubusercontent.com/11269635/28756233-c9f63abe-756a-11e7-883f-a084f35c55e7.gif)
+
+## Prerequisites/Requirements
+
+- PHP 5.4.0 or greater
+
+## Installation
+
+Installation is possible using Composer
+
+```shell
+composer require bramus/ansi-php ~3.1
+```
+
+## Usage
+
+The easiest way to use _ANSI PHP_ is to use the bundled `Ansi` helper class which provides easy shorthands to working with `bramus/ansi-php`. The `Ansi` class is written in such a way that you can chain calls to one another.
+
+If you're feeling adventurous, you're of course free to use the raw `ControlFunction` and `ControlSequence` classes.
+
+### Quick example
+
+```php
+use \Bramus\Ansi\Ansi;
+use \Bramus\Ansi\Writers\StreamWriter;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR;
+
+// Create Ansi Instance
+$ansi = new Ansi(new StreamWriter('php://stdout'));
+
+// Output some styled text on screen, along with a Line Feed and a Bell
+$ansi->color(array(SGR::COLOR_FG_RED, SGR::COLOR_BG_WHITE))
+     ->blink()
+     ->text('I will be blinking red on a white background.')
+     ->nostyle()
+     ->text(' And I will be normally styled.')
+     ->lf()
+     ->text('Ooh, a bell is coming ...')
+     ->bell();
+```
+
+See more examples further down on how to use these.
+
+## Concepts
+
+Since v3.0 `bramus/ansi-php` uses the concept of writers to write the data to. By default a `StreamWriter` writing to `php://stdout` is used.
+
+The following writers are provided
+
+- `StreamWriter`: Writes the data to a stream. Just pass in the path to a file and it will open a stream for you. Defaults to writing to `php://stdout`.
+- `BufferWriter`: Writes the data to a buffer. When calling `flush()` the contents of the buffer will be returned.
+- `ProxyWriter`: Acts as a proxy to another writer. Writes the data to an internal buffer. When calling `flush()` the writer will first write the data to the other writer before returning it.
+
+## The `Ansi` helper class functions
+
+### Core functions:
+
+- `text($text)`: Write a piece of data to the writer
+- `setWriter(\Bramus\Ansi\Writers\WriterInterface $writer)`: Sets the writer
+- `getWriter()`: Gets the writer
+
+### ANSI Control Function shorthands:
+
+These shorthands write a Control Character to the writer.
+
+- `bell()`:  Bell Control Character (`\a`)
+- `backspace()`:  Backspace Control Character (`\b`)
+- `tab()`:  Tab Control Character (`\t`)
+- `lf()`:  Line Feed Control Character (`\n`)
+- `cr()`:  Carriage Return Control Character (`\r`)
+- `esc()`:  Escape Control Character
+
+### SGR ANSI Escape Sequence shorthands:
+
+These shorthands write SGR ANSI Escape Sequences to the writer.
+
+- `nostyle()` or `reset()`: Remove all text styling (colors, bold, etc)
+- `color()`: Set the foreground and/or backgroundcolor of the text. _(see further)_
+- `bold()` or `bright()`: Bold: On. On some systems "Intensity: Bright"
+- `normal()`: Bold: Off. On some systems "Intensity: Normal"
+- `faint()`: Intensity: Faint. _(Not widely supported)_
+- `italic()`: Italic: On. _(Not widely supported)_
+- `underline()`: Underline: On.
+- `blink()`: Blink: On.
+- `negative()`: Inverse or Reverse. Swap foreground and background.
+- `strikethrough()`: Strikethrough: On. _(Not widely supported)_
+
+__IMPORTANT:__ Select Graphic Rendition works in such a way that text styling you have set will remain active until you call `nostyle()` or `reset()` to return to the default styling.
+
+### ED ANSI Escape Sequence shorthands:
+
+These shorthands write ED ANSI Escape Sequences to the writer.
+
+- `eraseDisplay()`: Erase the entire screen and moves the cursor to home.
+- `eraseDisplayUp()`: Erase the screen from the current line up to the top of the screen.
+- `eraseDisplayDown()`: Erase the screen from the current line down to the bottom of the screen.
+
+### EL ANSI Escape Sequence shorthands:
+
+These shorthands write EL ANSI Escape Sequences to the writer.
+
+- `eraseLine()`: Erase the entire current line.
+- `eraseLineToEOL()`: Erase from the current cursor position to the end of the current line.
+- `eraseLineToSOL()`: Erases from the current cursor position to the start of the current line.
+
+### CUB/CUD/CUF/CUP/CUU ANSI Escape Sequence shorthands:
+
+- `cursorBack($n)`: Move cursor back `$n` positions _(default: 1)_
+- `cursorForward($n)`: Move cursor forward `$n` positions _(default: 1)_
+- `cursorDown($n)`: Move cursor down `$n` positions _(default: 1)_
+- `cursorUp($n)`: Move cursor up `$n` positions _(default: 1)_
+- `cursorPosition($n, $m)`: Move cursor to position `$n,$m` _(default: 1,1)_
+
+### Extra functions
+
+- `flush()` or `get()`: Retrieve contents of a `FlushableWriter` writer.
+- `e()`: Echo the contents of a `FlushableWriter` writer.
+
+## Examples
+
+### The Basics
+
+```php
+// Create Ansi Instance
+$ansi = new \Bramus\Ansi\Ansi();
+
+// This will output a Bell
+$ansi->bell();
+
+// This will output some text
+$ansi->text('Hello World!');
+```
+
+_NOTE:_ As no `$writer` is passed into the constructor of `\Bramus\Ansi\Ansi`, the default `StreamWriter` writing to `php://stdout` is used.
+
+### Using a `FlushableWriter`
+
+Flushable Writers are writers that cache the data and only output it when flushed using its `flush()` function. The `BufferWriter` and `ProxyWriter` implement this interface.
+
+```php
+// Create Ansi Instance
+$ansi = new \Bramus\Ansi\Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+// This will append a bell to the buffer. It will not output it.
+$ansi->bell();
+
+// This will append a bell to the buffer. It will not output it.
+$ansi->text('Hello World!');
+
+// Now we'll output it
+echo $ansi->get();
+```
+
+### Chaining
+
+`bramus/ansi-php`'s wrapper `Ansi` class supports chaining.
+
+```php
+// Create Ansi Instance
+$ansi = new \Bramus\Ansi\Ansi();
+
+// This will output a Line Feed, some text, a Bell, and a Line Feed
+$ansi->lf()->text('hello')->bell()->lf();
+
+```
+
+### Styling Text: The Basics
+
+```php
+$ansi = new \Bramus\Ansi\Ansi();
+$ansi->bold()->underline()->text('I will be bold and underlined')->lf();
+```
+
+__IMPORTANT__ Select Graphic Rendition works in such a way that text styling  you have set will remain active until you call `nostyle()` or `reset()` to return to the default styling.
+
+
+```php
+$ansi = new \Bramus\Ansi\Ansi();
+
+$ansi->bold()->underline()->text('I will be bold and underlined')->lf();
+$ansi->text('I will also be bold because nostyle() has not been called yet')->lf();
+$ansi->nostyle()->blink()->text('I will be blinking')->nostyle()->lf();
+$ansi->text('I will be normal because nostyle() was called on the previous line');
+
+```
+
+### Styling Text: Colors
+
+Colors, and other text styling options, are defined as contants on `\Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR`.
+
+#### Foreground (Text) Colors
+
+- `SGR::COLOR_FG_BLACK`: Black Foreground Color
+- `SGR::COLOR_FG_RED`: Red Foreground Color
+- `SGR::COLOR_FG_GREEN`: Green Foreground Color
+- `SGR::COLOR_FG_YELLOW`: Yellow Foreground Color
+- `SGR::COLOR_FG_BLUE`: Blue Foreground Color
+- `SGR::COLOR_FG_PURPLE`: Purple Foreground Color
+- `SGR::COLOR_FG_CYAN`: Cyan Foreground Color
+- `SGR::COLOR_FG_WHITE`: White Foreground Color
+- `SGR::COLOR_FG_BLACK_BRIGHT`: Black Foreground Color (Bright)
+- `SGR::COLOR_FG_RED_BRIGHT`: Red Foreground Color (Bright)
+- `SGR::COLOR_FG_GREEN_BRIGHT`: Green Foreground Color (Bright)
+- `SGR::COLOR_FG_YELLOW_BRIGHT`: Yellow Foreground Color (Bright)
+- `SGR::COLOR_FG_BLUE_BRIGHT`: Blue Foreground Color (Bright)
+- `SGR::COLOR_FG_PURPLE_BRIGHT`: Purple Foreground Color (Bright)
+- `SGR::COLOR_FG_CYAN_BRIGHT`: Cyan Foreground Color (Bright)
+- `SGR::COLOR_FG_WHITE_BRIGHT`: White Foreground Color (Bright)
+- `SGR::COLOR_FG_RESET`: Default Foreground Color
+
+#### Background Colors
+
+- `SGR::COLOR_BG_BLACK`: Black Background Color
+- `SGR::COLOR_BG_RED`: Red Background Color
+- `SGR::COLOR_BG_GREEN`: Green Background Color
+- `SGR::COLOR_BG_YELLOW`: Yellow Background Color
+- `SGR::COLOR_BG_BLUE`: Blue Background Color
+- `SGR::COLOR_BG_PURPLE`: Purple Background Color
+- `SGR::COLOR_BG_CYAN`: Cyan Background Color
+- `SGR::COLOR_BG_WHITE`: White Background Color
+- `SGR::COLOR_BG_BLACK_BRIGHT`: Black Background Color (Bright)
+- `SGR::COLOR_BG_RED_BRIGHT`: Red Background Color (Bright)
+- `SGR::COLOR_BG_GREEN_BRIGHT`: Green Background Color (Bright)
+- `SGR::COLOR_BG_YELLOW_BRIGHT`: Yellow Background Color (Bright)
+- `SGR::COLOR_BG_BLUE_BRIGHT`: Blue Background Color (Bright)
+- `SGR::COLOR_BG_PURPLE_BRIGHT`: Purple Background Color (Bright)
+- `SGR::COLOR_BG_CYAN_BRIGHT`: Cyan Background Color (Bright)
+- `SGR::COLOR_BG_WHITE_BRIGHT`: White Background Color (Bright)
+- `SGR::COLOR_BG_RESET`: Default Background Color
+
+Pass one of these into `$ansi->color()` and the color will be set.
+
+```php
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR;
+
+$ansi = new \Bramus\Ansi\Ansi();
+
+$ansi->color(SGR::COLOR_FG_RED)
+     ->text('I will be red')
+     ->nostyle();
+```
+
+To set the foreground and background color in one call, pass them using an array to `$ansi->color()`
+
+```php
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR;
+
+$ansi = new \Bramus\Ansi\Ansi();
+
+$ansi->color(array(SGR::COLOR_FG_RED, SGR::COLOR_BG_WHITE))
+     ->blink()
+     ->text('I will be blinking red on a wrhite background.')
+     ->nostyle();
+```
+
+### Creating a loading Spinner
+
+By manipulating the cursor position one can create an in-place spinner
+
+```php
+use \Bramus\Ansi\Ansi;
+use \Bramus\Ansi\Writers\StreamWriter;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\EL;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR;
+
+// Create Ansi Instance
+$ansi = new Ansi(new StreamWriter('php://stdout'));
+
+// Parts of our spinner
+$spinnerParts = ['⣷','⣯','⣟','⡿','⢿','⣻','⣽','⣾'];
+
+$ansi->text('Loading Data')->lf();
+for ($i = 0; $i < 100; $i++) {
+    $ansi
+        // Erase entire line
+        ->el(EL::ALL)
+        // Go back to very first position on current line
+        ->cursorBack(9999)
+        // Add a blue spinner
+        ->color(SGR::COLOR_FG_BLUE)->text($spinnerParts[$i % sizeof($spinnerParts)])
+        // Write percentage
+        ->nostyle()->text(' ' . str_pad($i, 3, 0, STR_PAD_LEFT) . '%');
+
+    usleep(50000);
+}
+$ansi
+    ->el(EL::ALL)
+    ->cursorBack(9999)
+    ->color(SGR::COLOR_FG_GREEN)->text('✔')
+    ->nostyle()->text(' 100%')
+    ->lf();
+```
+
+This snippet will output a little loading spinner icon + the current percentage (e.g. `⣯ 009%`) that constantly updates in-place. When 100% is reached, the line will read `✔ 100%`.
+
+### Using the raw classes
+
+As all raw `ControlFunction` and `ControlSequence` classes are provided with a `__toString()` function it's perfectly possible to directly `echo` some `bramus/ansi-php` instance.
+
+```php
+// Output a Bell Control Character
+echo new \Bramus\Ansi\ControlFunctions\Bell();
+
+// Output an ED instruction, to erase the entire screen
+echo new \Bramus\Ansi\ControlSequences\EscapeSequences\ED(
+    \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\ED::ALL
+);
+```
+
+To fetch their contents, use the `get()` function:
+
+```php
+// Get ANSI string for a Bell Control Character
+$bell = (new \Bramus\Ansi\ControlFunctions\Bell())->get();
+
+// Get ANSI string for an ED instruction, to erase the entire screen
+$eraseDisplay = (new \Bramus\Ansi\ControlSequences\EscapeSequences\ED(
+    \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\ED::ALL
+))->get();
+
+echo $bell . $bell . $eraseDisplay . $bell;
+```
+
+## Unit Testing
+
+`bramus/ansi-php` ships with unit tests using [PHPUnit](https://github.com/sebastianbergmann/phpunit/).
+
+- If PHPUnit is installed globally run `phpunit` to run the tests.
+
+- If PHPUnit is not installed globally, install it locally throuh composer by running `composer install --dev`. Run the tests themselves by calling `vendor/bin/phpunit` or `composer test`
+
+Unit tests are also automatically run [on Travis CI](http://travis-ci.org/bramus/ansi-php)
+
+## License
+
+`bramus/ansi-php` is released under the MIT public license. See the enclosed `LICENSE` for details.
+
+## ANSI References
+
+- [http://en.wikipedia.org/wiki/ANSI_escape_code](http://en.wikipedia.org/wiki/ANSI_escape_code)
+- [http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-048.pdf](http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-048.pdf)
+- [http://wiki.bash-hackers.org/scripting/terminalcodes](http://wiki.bash-hackers.org/scripting/terminalcodes)
+- [http://web.mit.edu/gnu/doc/html/screen_10.html](http://web.mit.edu/gnu/doc/html/screen_10.html)
+- [http://www.isthe.com/chongo/tech/comp/ansi_escapes.html](http://www.isthe.com/chongo/tech/comp/ansi_escapes.html)
+- [http://www.termsys.demon.co.uk/vtansi.htm](http://www.termsys.demon.co.uk/vtansi.htm)
+- [http://rrbrandt.dee.ufcg.edu.br/en/docs/ansi/](http://rrbrandt.dee.ufcg.edu.br/en/docs/ansi/)
+- [http://tldp.org/HOWTO/Bash-Prompt-HOWTO/c327.html](http://tldp.org/HOWTO/Bash-Prompt-HOWTO/c327.html)

+ 116 - 111
vendor/bramus/ansi-php/src/Ansi.php

@@ -1,111 +1,116 @@
-<?php
-
-namespace Bramus\Ansi;
-
-/**
- * ANSI Wrapper Class to work with \Bramus\Ansi more easily
- */
-class Ansi
-{
-    /**
-     * Traits to use
-     */
-    use Traits\ControlFunctions;
-    use Traits\EscapeSequences\SGR;
-    use Traits\EscapeSequences\ED;
-    use Traits\EscapeSequences\EL;
-
-    /**
-     * The writer to write the data to
-     * @var Writer\WriterInterface
-     */
-    protected $writer;
-
-    /**
-     * ANSI Wrapper Class to work with \Bramus\Ansi more easily
-     * @param Writer\WriterInterface $writer writer to use
-     */
-    public function __construct($writer = null)
-    {
-        // Enforce having a writer
-        if (!$writer) {
-            $writer = new Writers\StreamWriter();
-        }
-
-        // Set the writer
-        $this->setWriter($writer);
-    }
-
-    /**
-     * Sets the writer
-     * @param Writer\WriterInterface $writer The writer to use
-     */
-    public function setWriter(Writers\WriterInterface $writer)
-    {
-        $this->writer = $writer;
-    }
-
-    /**
-     * Gets the writer
-     * @return Writer\WriterInterface $writer The writer used
-     */
-    public function getWriter()
-    {
-        return $this->writer;
-    }
-
-    /**
-     * Write a piece of text onto the writer
-     * @param  string $text The text to write
-     * @return Ansi   self, for chaining
-     */
-    public function text($text)
-    {
-        // Write the text to the writer
-        $this->writer->write($text);
-
-        // Afford chaining
-        return $this;
-    }
-
-    /**
-     * Flush the contents of the writer
-     * @param  $resetAfterwards Reset the writer contents after flushing?
-     * @return string The writer contents
-     */
-    public function flush($resetAfterwards = true)
-    {
-        if ($this->writer instanceof Writers\FlushableInterface) {
-            return $this->writer->flush($resetAfterwards);
-        } else {
-            throw new \Exception('Flushing a non FlushableInterface is not possible');
-        }
-    }
-
-    public function get($resetAfterwards = true)
-    {
-        try {
-            return $this->flush($resetAfterwards);
-        } catch (\Exception $e) {
-            throw $e;
-        }
-    }
-
-    /**
-     * Echo the contents of the writer
-     * @param  $resetAfterwards Reset the writer contents after flushing?
-     * @return Ansi self, for chaining
-     */
-    public function e($resetAfterwards = true)
-    {
-        try {
-            // Get the contents and echo them
-            echo $this->flush($resetAfterwards);
-
-            // Afford chaining
-            return $this;
-        } catch (\Exception $e) {
-            throw $e;
-        }
-    }
-}
+<?php
+
+namespace Bramus\Ansi;
+
+/**
+ * ANSI Wrapper Class to work with \Bramus\Ansi more easily
+ */
+class Ansi
+{
+    /**
+     * Traits to use
+     */
+    use Traits\ControlFunctions;
+    use Traits\EscapeSequences\ED;
+    use Traits\EscapeSequences\EL;
+    use Traits\EscapeSequences\CUB;
+    use Traits\EscapeSequences\CUD;
+    use Traits\EscapeSequences\CUF;
+    use Traits\EscapeSequences\CUP;
+    use Traits\EscapeSequences\CUU;
+    use Traits\EscapeSequences\SGR;
+
+    /**
+     * The writer to write the data to
+     * @var Writers\WriterInterface
+     */
+    protected $writer;
+
+    /**
+     * ANSI Wrapper Class to work with \Bramus\Ansi more easily
+     * @param Writers\WriterInterface $writer writer to use
+     */
+    public function __construct($writer = null)
+    {
+        // Enforce having a writer
+        if (!$writer) {
+            $writer = new Writers\StreamWriter();
+        }
+
+        // Set the writer
+        $this->setWriter($writer);
+    }
+
+    /**
+     * Sets the writer
+     * @param Writers\WriterInterface $writer The writer to use
+     */
+    public function setWriter(Writers\WriterInterface $writer)
+    {
+        $this->writer = $writer;
+    }
+
+    /**
+     * Gets the writer
+     * @return Writers\WriterInterface $writer The writer used
+     */
+    public function getWriter()
+    {
+        return $this->writer;
+    }
+
+    /**
+     * Write a piece of text onto the writer
+     * @param  string $text The text to write
+     * @return Ansi   self, for chaining
+     */
+    public function text($text)
+    {
+        // Write the text to the writer
+        $this->writer->write($text);
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Flush the contents of the writer
+     * @param  $resetAfterwards Reset the writer contents after flushing?
+     * @return string The writer contents
+     */
+    public function flush($resetAfterwards = true)
+    {
+        if ($this->writer instanceof Writers\FlushableInterface) {
+            return $this->writer->flush($resetAfterwards);
+        } else {
+            throw new \Exception('Flushing a non FlushableInterface is not possible');
+        }
+    }
+
+    public function get($resetAfterwards = true)
+    {
+        try {
+            return $this->flush($resetAfterwards);
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Echo the contents of the writer
+     * @param  $resetAfterwards Reset the writer contents after flushing?
+     * @return Ansi self, for chaining
+     */
+    public function e($resetAfterwards = true)
+    {
+        try {
+            // Get the contents and echo them
+            echo $this->flush($resetAfterwards);
+
+            // Afford chaining
+            return $this;
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    }
+}

+ 13 - 13
vendor/bramus/ansi-php/src/ControlFunctions/Backspace.php

@@ -1,13 +1,13 @@
-<?php
-/**
- *
- */
-namespace Bramus\Ansi\ControlFunctions;
-
-class Backspace extends Base
-{
-    public function __construct()
-    {
-        parent::__construct(Enums\C0::BACKSPACE);
-    }
-}
+<?php
+/**
+ *
+ */
+namespace Bramus\Ansi\ControlFunctions;
+
+class Backspace extends Base
+{
+    public function __construct()
+    {
+        parent::__construct(Enums\C0::BACKSPACE);
+    }
+}

+ 71 - 71
vendor/bramus/ansi-php/src/ControlFunctions/Base.php

@@ -1,71 +1,71 @@
-<?php
-/**
- * ANSI Control Function
- *
- * An element of a character set that effects the recording, processing,
- * transmission, or interpretation of data, and that has a coded
- * representation consisting of one or more bit combinations.
- *
- */
-namespace Bramus\Ansi\ControlFunctions;
-
-class Base
-{
-    /**
-     * The Control Character used
-     * @var string
-     */
-    protected $controlCharacter;
-
-    /**
-     * ANSI Control Function
-     * @param string $controlCharacter The Control Character to use
-     */
-    public function __construct($controlCharacter)
-    {
-        // Store the Control Character
-        $this->setControlCharacter($controlCharacter);
-    }
-
-    /**
-     * Set the control character
-     * @param string $controlCharacter The Control Character
-     */
-    public function setControlCharacter($controlCharacter)
-    {
-        // @TODO: Check Validity
-        $this->controlCharacter = $controlCharacter;
-
-        return $this;
-    }
-
-    /**
-     * Build and return the ANSI Code
-     * @return string The ANSI Code
-     */
-    public function get()
-    {
-        return $this->controlCharacter;
-    }
-
-    /**
-     * Return the ANSI Code upon __toString
-     * @return string The ANSI Code
-     */
-    public function __toString()
-    {
-        return $this->get();
-    }
-
-    /**
-     * Echo the ANSI Code
-     */
-    public function e()
-    {
-        echo $this->get();
-
-        return $this;
-    }
-}
-
-// EOF
+<?php
+/**
+ * ANSI Control Function
+ *
+ * An element of a character set that effects the recording, processing,
+ * transmission, or interpretation of data, and that has a coded
+ * representation consisting of one or more bit combinations.
+ *
+ */
+namespace Bramus\Ansi\ControlFunctions;
+
+class Base
+{
+    /**
+     * The Control Character used
+     * @var string
+     */
+    protected $controlCharacter;
+
+    /**
+     * ANSI Control Function
+     * @param string $controlCharacter The Control Character to use
+     */
+    public function __construct($controlCharacter)
+    {
+        // Store the Control Character
+        $this->setControlCharacter($controlCharacter);
+    }
+
+    /**
+     * Set the control character
+     * @param string $controlCharacter The Control Character
+     */
+    public function setControlCharacter($controlCharacter)
+    {
+        // @TODO: Check Validity
+        $this->controlCharacter = $controlCharacter;
+
+        return $this;
+    }
+
+    /**
+     * Build and return the ANSI Code
+     * @return string The ANSI Code
+     */
+    public function get()
+    {
+        return $this->controlCharacter;
+    }
+
+    /**
+     * Return the ANSI Code upon __toString
+     * @return string The ANSI Code
+     */
+    public function __toString()
+    {
+        return $this->get();
+    }
+
+    /**
+     * Echo the ANSI Code
+     */
+    public function e()
+    {
+        echo $this->get();
+
+        return $this;
+    }
+}
+
+// EOF

+ 13 - 13
vendor/bramus/ansi-php/src/ControlFunctions/Bell.php

@@ -1,13 +1,13 @@
-<?php
-/**
- *
- */
-namespace Bramus\Ansi\ControlFunctions;
-
-class Bell extends Base
-{
-    public function __construct()
-    {
-        parent::__construct(Enums\C0::BELL);
-    }
-}
+<?php
+/**
+ *
+ */
+namespace Bramus\Ansi\ControlFunctions;
+
+class Bell extends Base
+{
+    public function __construct()
+    {
+        parent::__construct(Enums\C0::BELL);
+    }
+}

+ 13 - 13
vendor/bramus/ansi-php/src/ControlFunctions/CarriageReturn.php

@@ -1,13 +1,13 @@
-<?php
-/**
- *
- */
-namespace Bramus\Ansi\ControlFunctions;
-
-class CarriageReturn extends Base
-{
-    public function __construct()
-    {
-        parent::__construct(Enums\C0::CR);
-    }
-}
+<?php
+/**
+ *
+ */
+namespace Bramus\Ansi\ControlFunctions;
+
+class CarriageReturn extends Base
+{
+    public function __construct()
+    {
+        parent::__construct(Enums\C0::CR);
+    }
+}

+ 361 - 361
vendor/bramus/ansi-php/src/ControlFunctions/Enums/C0.php

@@ -1,361 +1,361 @@
-<?php
-/**
- * The ANSI C0 Set
- *
- * Based upon http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-048.pdf, section 5.2
- *
- */
-namespace Bramus\Ansi\ControlFunctions\Enums;
-
-class C0
-{
-    /**
-     * NULL
-     *
-     * NUL is used for media-fill or time-fill. NUL characters may be inserted
-     * into, or removed from, a data stream without affecting the information
-     * content of that stream, but such action may affect the information layout
-     * and/or the control of equipment.
-     *
-     * @var String
-     */
-    const NUL = "\000";
-
-    /**
-     * START OF HEADING
-     *
-     * SOH is used to indicate the beginning of a heading.
-     * The use of SOH is defined in ISO 1745.
-     *
-     * @var String
-     */
-    const SOH = "\001";
-
-    /**
-     * START OF TEXT
-     *
-     * STX is used to indicate the beginning of a text and the end of a heading.
-     * The use of STX is defined in ISO 1745.
-     *
-     * @var String
-     */
-    const STX = "\002";
-
-    /**
-     * END OF TEXT
-     *
-     * ETX is used to indicate the end of a text.
-     * The use of ETX is defined in ISO 1745.
-     *
-     * @var String
-     */
-    const ETX = "\003";
-
-    /**
-     * END OF TRANSMISSION
-     *
-     * EOT is used to indicate the conclusion of the transmission of one or more texts.
-     * The use of EOT is defined in ISO 1745.
-     *
-     * @var String
-     */
-    const EOT = "\004";
-
-    /**
-     * ENQUIRY
-     *
-     * ENQ is transmitted by a sender as a request for a response from a receiver.
-     * The use of ENQ is defined in ISO 1745.
-     *
-     * @var String
-     */
-    const ENQ = "\005";
-
-    /**
-     * ACKNOWLEDGE
-     *
-     * ACK is transmitted by a receiver as an affirmative response to the sender.
-     * The use of ACK is defined in ISO 1745.
-     *
-     * @var String
-     */
-    const ACK = "\006";
-
-    /**
-     * BELL
-     *
-     * BEL is used when there is a need to call for attention; it may control alarm
-     * or attention devices.
-     *
-     * @var string
-     */
-    const BEL = "\007";
-    const BELL = "\007";
-
-    /**
-     * BACKSPACE
-     *
-     * BS causes the active data position to be moved one character position in the
-     * data component in the direction opposite to that of the implicit movement.
-     *
-     * @var string
-     */
-    const BS = "\010";
-    const BACKSPACE = "\010";
-
-    /**
-     * CHARACTER TABULATION (HORIZONTAL TAB)
-     *
-     * HT causes the active presentation position to be moved to the following
-     * character tabulation stop in the presentation component.
-     *
-     * @var string
-     */
-    const HT = "\011";
-    const TAB = "\011";
-
-    /**
-     * LINE FEED
-     *
-     * LF causes the active data position to be moved to the corresponding
-     * character position of the following line in the data component.
-     *
-     * @var string
-     */
-    const LF = "\012";
-
-    /**
-     * LINE TABULATION (VERTICAL TAB)
-     *
-     * VT causes the active presentation position to be moved in the presentation
-     * component to the corresponding character position on the line at which the
-     * following line tabulation stop is set.
-     *
-     * @var String
-     */
-    const VT = "\013";
-
-    /**
-     * FORM FEED
-     *
-     * FF causes the active presentation position to be moved to the corresponding
-     * character position of the line at the page home position of the next form or
-     * page in the presentation component
-     *
-     * @var String
-     */
-    const FF = "\014";
-
-    /**
-     * CARRIAGE RETURN
-     *
-     * CR causes the active data position to be moved to the line home position of
-     * the same line in the data component
-     *
-     * @var string
-     */
-    const CR = "\015";
-
-    /**
-     * LOCKING-SHIFT ONE
-     *
-     * LS1 is used for code extension purposes. It causes the meanings of the bit
-     * combinations following it in the data stream to be changed.
-     * The use of LS1 is defined in Standard ECMA-35.
-     *
-     * @var String
-     */
-    const LS1 = "\016";
-
-    /**
-     * LOCKING-SHIFT ZERO
-     *
-     * LS0 is used for code extension purposes. It causes the meanings of the bit
-     * combinations following it in the data stream to be changed.
-     * The use of LS0 is defined in Standard ECMA-35.
-     *
-     * @var String
-     */
-    const LS0 = "\017";
-
-    /**
-     * DATA LINK ESCAPE
-     *
-     * DLE is used exclusively to provide supplementary transmission control functions.
-     * The use of DLE is defined in ISO 1745.
-     *
-     * @var String
-     */
-    const DLE = "\020";
-
-    /**
-     * DEVICE CONTROL ONE
-     *
-     * DC1 is primarily intended for turning on or starting an ancillary device.
-     * If it is not required for this purpose, it may be used to restore a device to
-     * the basic mode of operation (see also DC2 and DC3), or any other device control
-     * function not provided by other DCs.
-     *
-     * @var String
-     */
-    const DC1 = "\021";
-
-    /**
-     * DEVICE CONTROL TWO
-     *
-     * DC2 is primarily intended for turning on or starting an ancillary device.
-     * If it is not required for this purpose, it may be used to set a device to a
-     * special mode of operation (in which case DC1 is used to restore the device to
-     * the basic mode), or for any other device control function not provided
-     * by other DCs.
-     *
-     * @var String
-     */
-    const DC2 = "\022";
-
-    /**
-     * DEVICE CONTROL THREE
-     *
-     * DC3 is primarily intended for turning off or stopping an ancillary device.
-     * This function may be a secondary level stop, for example wait, pause,
-     * stand-by or halt (in which case DC1 is used to restore normal operation).
-     * If it is not required for this purpose, it may be used for any other device control
-     * function not provided by other DCs.
-     *
-     * @var String
-     */
-    const DC3 = "\023";
-
-    /**
-     * DEVICE CONTROL FOUR
-     *
-     * DC4 is primarily intended for turning off, stopping or interrupting an ancillary
-     * device. If it is not required for this purpose, it may be used for any other device
-     * control function not provided by other DCs
-     *
-     * @var String
-     */
-    const DC4 = "\024";
-
-    /**
-     * NEGATIVE ACKNOWLEDGE
-     *
-     * NAK is transmitted by a receiver as a negative response to the sender.
-     * The use of NAK is defined in ISO 1745.
-     *
-     * @var String
-     */
-    const NAK = "\025";
-
-    /**
-     * SYNCHRONOUS IDLE
-     *
-     * SYN is used by a synchronous transmission system in the absence of any other
-     * character (idle condition) to provide a signal from which synchronism may be
-     * achieved or retained between data terminal equipment.
-     * The use of SYN is defined in ISO 1745.
-     *
-     * @var String
-     */
-    const SYN = "\026";
-
-    /**
-     * END OF TRANSMISSION BLOCK
-     *
-     * ETB is used to indicate the end of a block of data where the data are
-     * divided into such blocks for transmission purposes.
-     * The use of ETB is defined in ISO 1745.
-     *
-     * @var String
-     */
-    const ETB = "\027";
-
-    /**
-     * CANCEL
-     *
-     * CAN is used to indicate that the data preceding it in the data stream is
-     * in error. As a result, this data shall be ignored. The specific meaning
-     * of this control function shall be defined for each application and/or
-     * between sender and recipient.
-     *
-     * @var String
-     */
-    const CAN = "\030";
-    const CANCEL = "\030";
-
-    /**
-     * END OF MEDIUM
-     *
-     * EM is used to identify the physical end of a medium, or the end of the used
-     * portion of a medium, or the end of the wanted portion of data recorded on
-     * a medium.
-     *
-     * @var String
-     */
-    const EM = "\031";
-
-    /**
-     * SUBSTITUTE
-     *
-     * SUB is used in the place of a character that has been found to be invalid
-     * or in error. SUB is intended to be introduced by automatic means.
-     *
-     * @var String
-     */
-    const SUB = "\032";
-
-    /**
-     * ESCAPE
-     *
-     * ESC is used for code extension purposes. It causes the meanings of a limited
-     * number of bit combinations following it in the data stream to be changed.
-     * The use of ESC is defined in Standard ECMA-35.
-     *
-     * @var string
-     */
-    const ESC = "\033";
-
-    /**
-     * INFORMATION SEPARATOR FOUR (FS - FILE SEPARATOR)
-     *
-     * IS4 is used to separate and qualify data logically; its specific meaning has
-     * to be defined for each application. If this control function is used in
-     * hierarchical order, it may delimit a data item called a file.
-     *
-     * @var String
-     */
-    const IS4 = "\034";
-
-    /**
-     * INFORMATION SEPARATOR THREE (GS - GROUP SEPARATOR)
-     *
-     * IS3 is used to separate and qualify data logically; its specific meaning has
-     * to be defined for each application. If this control function is used in
-     * hierarchical order, it may delimit a data item called a group.
-     *
-     * @var String
-     */
-    const IS3 = "\035";
-
-    /**
-     * INFORMATION SEPARATOR TWO (RS - RECORD SEPARATOR)
-     *
-     * IS2 is used to separate and qualify data logically; its specific meaning has
-     * to be defined for each application. If this control function is used in
-     * hierarchical order, it may delimit a data item called a record.
-     *
-     * @var String
-     */
-    const IS2 = "\036";
-
-    /**
-     * INFORMATION SEPARATOR ONE (US - UNIT SEPARATOR)
-     *
-     * IS1 is used to separate and qualify data logically; its specific meaning has
-     * to be defined for each application. If this control function is used in
-     * hierarchical order, it may delimit a data item called a unit.
-     *
-     * @var String
-     */
-    const IS1 = "\037";
-}
+<?php
+/**
+ * The ANSI C0 Set
+ *
+ * Based upon http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-048.pdf, section 5.2
+ *
+ */
+namespace Bramus\Ansi\ControlFunctions\Enums;
+
+class C0
+{
+    /**
+     * NULL
+     *
+     * NUL is used for media-fill or time-fill. NUL characters may be inserted
+     * into, or removed from, a data stream without affecting the information
+     * content of that stream, but such action may affect the information layout
+     * and/or the control of equipment.
+     *
+     * @var String
+     */
+    const NUL = "\000";
+
+    /**
+     * START OF HEADING
+     *
+     * SOH is used to indicate the beginning of a heading.
+     * The use of SOH is defined in ISO 1745.
+     *
+     * @var String
+     */
+    const SOH = "\001";
+
+    /**
+     * START OF TEXT
+     *
+     * STX is used to indicate the beginning of a text and the end of a heading.
+     * The use of STX is defined in ISO 1745.
+     *
+     * @var String
+     */
+    const STX = "\002";
+
+    /**
+     * END OF TEXT
+     *
+     * ETX is used to indicate the end of a text.
+     * The use of ETX is defined in ISO 1745.
+     *
+     * @var String
+     */
+    const ETX = "\003";
+
+    /**
+     * END OF TRANSMISSION
+     *
+     * EOT is used to indicate the conclusion of the transmission of one or more texts.
+     * The use of EOT is defined in ISO 1745.
+     *
+     * @var String
+     */
+    const EOT = "\004";
+
+    /**
+     * ENQUIRY
+     *
+     * ENQ is transmitted by a sender as a request for a response from a receiver.
+     * The use of ENQ is defined in ISO 1745.
+     *
+     * @var String
+     */
+    const ENQ = "\005";
+
+    /**
+     * ACKNOWLEDGE
+     *
+     * ACK is transmitted by a receiver as an affirmative response to the sender.
+     * The use of ACK is defined in ISO 1745.
+     *
+     * @var String
+     */
+    const ACK = "\006";
+
+    /**
+     * BELL
+     *
+     * BEL is used when there is a need to call for attention; it may control alarm
+     * or attention devices.
+     *
+     * @var string
+     */
+    const BEL = "\007";
+    const BELL = "\007";
+
+    /**
+     * BACKSPACE
+     *
+     * BS causes the active data position to be moved one character position in the
+     * data component in the direction opposite to that of the implicit movement.
+     *
+     * @var string
+     */
+    const BS = "\010";
+    const BACKSPACE = "\010";
+
+    /**
+     * CHARACTER TABULATION (HORIZONTAL TAB)
+     *
+     * HT causes the active presentation position to be moved to the following
+     * character tabulation stop in the presentation component.
+     *
+     * @var string
+     */
+    const HT = "\011";
+    const TAB = "\011";
+
+    /**
+     * LINE FEED
+     *
+     * LF causes the active data position to be moved to the corresponding
+     * character position of the following line in the data component.
+     *
+     * @var string
+     */
+    const LF = "\012";
+
+    /**
+     * LINE TABULATION (VERTICAL TAB)
+     *
+     * VT causes the active presentation position to be moved in the presentation
+     * component to the corresponding character position on the line at which the
+     * following line tabulation stop is set.
+     *
+     * @var String
+     */
+    const VT = "\013";
+
+    /**
+     * FORM FEED
+     *
+     * FF causes the active presentation position to be moved to the corresponding
+     * character position of the line at the page home position of the next form or
+     * page in the presentation component
+     *
+     * @var String
+     */
+    const FF = "\014";
+
+    /**
+     * CARRIAGE RETURN
+     *
+     * CR causes the active data position to be moved to the line home position of
+     * the same line in the data component
+     *
+     * @var string
+     */
+    const CR = "\015";
+
+    /**
+     * LOCKING-SHIFT ONE
+     *
+     * LS1 is used for code extension purposes. It causes the meanings of the bit
+     * combinations following it in the data stream to be changed.
+     * The use of LS1 is defined in Standard ECMA-35.
+     *
+     * @var String
+     */
+    const LS1 = "\016";
+
+    /**
+     * LOCKING-SHIFT ZERO
+     *
+     * LS0 is used for code extension purposes. It causes the meanings of the bit
+     * combinations following it in the data stream to be changed.
+     * The use of LS0 is defined in Standard ECMA-35.
+     *
+     * @var String
+     */
+    const LS0 = "\017";
+
+    /**
+     * DATA LINK ESCAPE
+     *
+     * DLE is used exclusively to provide supplementary transmission control functions.
+     * The use of DLE is defined in ISO 1745.
+     *
+     * @var String
+     */
+    const DLE = "\020";
+
+    /**
+     * DEVICE CONTROL ONE
+     *
+     * DC1 is primarily intended for turning on or starting an ancillary device.
+     * If it is not required for this purpose, it may be used to restore a device to
+     * the basic mode of operation (see also DC2 and DC3), or any other device control
+     * function not provided by other DCs.
+     *
+     * @var String
+     */
+    const DC1 = "\021";
+
+    /**
+     * DEVICE CONTROL TWO
+     *
+     * DC2 is primarily intended for turning on or starting an ancillary device.
+     * If it is not required for this purpose, it may be used to set a device to a
+     * special mode of operation (in which case DC1 is used to restore the device to
+     * the basic mode), or for any other device control function not provided
+     * by other DCs.
+     *
+     * @var String
+     */
+    const DC2 = "\022";
+
+    /**
+     * DEVICE CONTROL THREE
+     *
+     * DC3 is primarily intended for turning off or stopping an ancillary device.
+     * This function may be a secondary level stop, for example wait, pause,
+     * stand-by or halt (in which case DC1 is used to restore normal operation).
+     * If it is not required for this purpose, it may be used for any other device control
+     * function not provided by other DCs.
+     *
+     * @var String
+     */
+    const DC3 = "\023";
+
+    /**
+     * DEVICE CONTROL FOUR
+     *
+     * DC4 is primarily intended for turning off, stopping or interrupting an ancillary
+     * device. If it is not required for this purpose, it may be used for any other device
+     * control function not provided by other DCs
+     *
+     * @var String
+     */
+    const DC4 = "\024";
+
+    /**
+     * NEGATIVE ACKNOWLEDGE
+     *
+     * NAK is transmitted by a receiver as a negative response to the sender.
+     * The use of NAK is defined in ISO 1745.
+     *
+     * @var String
+     */
+    const NAK = "\025";
+
+    /**
+     * SYNCHRONOUS IDLE
+     *
+     * SYN is used by a synchronous transmission system in the absence of any other
+     * character (idle condition) to provide a signal from which synchronism may be
+     * achieved or retained between data terminal equipment.
+     * The use of SYN is defined in ISO 1745.
+     *
+     * @var String
+     */
+    const SYN = "\026";
+
+    /**
+     * END OF TRANSMISSION BLOCK
+     *
+     * ETB is used to indicate the end of a block of data where the data are
+     * divided into such blocks for transmission purposes.
+     * The use of ETB is defined in ISO 1745.
+     *
+     * @var String
+     */
+    const ETB = "\027";
+
+    /**
+     * CANCEL
+     *
+     * CAN is used to indicate that the data preceding it in the data stream is
+     * in error. As a result, this data shall be ignored. The specific meaning
+     * of this control function shall be defined for each application and/or
+     * between sender and recipient.
+     *
+     * @var String
+     */
+    const CAN = "\030";
+    const CANCEL = "\030";
+
+    /**
+     * END OF MEDIUM
+     *
+     * EM is used to identify the physical end of a medium, or the end of the used
+     * portion of a medium, or the end of the wanted portion of data recorded on
+     * a medium.
+     *
+     * @var String
+     */
+    const EM = "\031";
+
+    /**
+     * SUBSTITUTE
+     *
+     * SUB is used in the place of a character that has been found to be invalid
+     * or in error. SUB is intended to be introduced by automatic means.
+     *
+     * @var String
+     */
+    const SUB = "\032";
+
+    /**
+     * ESCAPE
+     *
+     * ESC is used for code extension purposes. It causes the meanings of a limited
+     * number of bit combinations following it in the data stream to be changed.
+     * The use of ESC is defined in Standard ECMA-35.
+     *
+     * @var string
+     */
+    const ESC = "\033";
+
+    /**
+     * INFORMATION SEPARATOR FOUR (FS - FILE SEPARATOR)
+     *
+     * IS4 is used to separate and qualify data logically; its specific meaning has
+     * to be defined for each application. If this control function is used in
+     * hierarchical order, it may delimit a data item called a file.
+     *
+     * @var String
+     */
+    const IS4 = "\034";
+
+    /**
+     * INFORMATION SEPARATOR THREE (GS - GROUP SEPARATOR)
+     *
+     * IS3 is used to separate and qualify data logically; its specific meaning has
+     * to be defined for each application. If this control function is used in
+     * hierarchical order, it may delimit a data item called a group.
+     *
+     * @var String
+     */
+    const IS3 = "\035";
+
+    /**
+     * INFORMATION SEPARATOR TWO (RS - RECORD SEPARATOR)
+     *
+     * IS2 is used to separate and qualify data logically; its specific meaning has
+     * to be defined for each application. If this control function is used in
+     * hierarchical order, it may delimit a data item called a record.
+     *
+     * @var String
+     */
+    const IS2 = "\036";
+
+    /**
+     * INFORMATION SEPARATOR ONE (US - UNIT SEPARATOR)
+     *
+     * IS1 is used to separate and qualify data logically; its specific meaning has
+     * to be defined for each application. If this control function is used in
+     * hierarchical order, it may delimit a data item called a unit.
+     *
+     * @var String
+     */
+    const IS1 = "\037";
+}

+ 13 - 13
vendor/bramus/ansi-php/src/ControlFunctions/Escape.php

@@ -1,13 +1,13 @@
-<?php
-/**
- *
- */
-namespace Bramus\Ansi\ControlFunctions;
-
-class Escape extends Base
-{
-    public function __construct()
-    {
-        parent::__construct(Enums\C0::ESC);
-    }
-}
+<?php
+/**
+ *
+ */
+namespace Bramus\Ansi\ControlFunctions;
+
+class Escape extends Base
+{
+    public function __construct()
+    {
+        parent::__construct(Enums\C0::ESC);
+    }
+}

+ 13 - 13
vendor/bramus/ansi-php/src/ControlFunctions/LineFeed.php

@@ -1,13 +1,13 @@
-<?php
-/**
- *
- */
-namespace Bramus\Ansi\ControlFunctions;
-
-class LineFeed extends Base
-{
-    public function __construct()
-    {
-        parent::__construct(Enums\C0::LF);
-    }
-}
+<?php
+/**
+ *
+ */
+namespace Bramus\Ansi\ControlFunctions;
+
+class LineFeed extends Base
+{
+    public function __construct()
+    {
+        parent::__construct(Enums\C0::LF);
+    }
+}

+ 13 - 13
vendor/bramus/ansi-php/src/ControlFunctions/Tab.php

@@ -1,13 +1,13 @@
-<?php
-/**
- *
- */
-namespace Bramus\Ansi\ControlFunctions;
-
-class Tab extends Base
-{
-    public function __construct()
-    {
-        parent::__construct(Enums\C0::TAB);
-    }
-}
+<?php
+/**
+ *
+ */
+namespace Bramus\Ansi\ControlFunctions;
+
+class Tab extends Base
+{
+    public function __construct()
+    {
+        parent::__construct(Enums\C0::TAB);
+    }
+}

+ 105 - 105
vendor/bramus/ansi-php/src/ControlSequences/Base.php

@@ -1,105 +1,105 @@
-<?php
-/**
- * ANSI Control Sequence
- *
- * A string of bit combinations starting with the control
- * function CONTROL SEQUENCE INTRODUCER (CSI), and used for
- * the coded representation of control functions with
- * or without parameters.
- */
-namespace Bramus\Ansi\ControlSequences;
-
-class Base
-{
-    /**
-     * A ControlFunction that acts as the Control Sequence Introducer (CSI)
-     * @var \Bramus\Ansi\ControlFunction
-     */
-    protected $controlSequenceIntroducer;
-
-    /**
-     * ANSI Control Sequence
-     * @param \Bramus\Ansi\ControlFunction $controlSequenceIntroducer A ControlFunction that acts as the Control Sequence Introducer (CSI)
-     * @param boolean                      $outputNow                 Output the resulting ANSI Code right now?
-     */
-    public function __construct($controlSequenceIntroducer)
-    {
-        // Store datamembers
-        $this->setControlSequenceIntroducer($controlSequenceIntroducer);
-    }
-
-    /**
-     * Set the control sequence introducer
-     * @param  \Bramus\Ansi\ControlFunction $controlSequenceIntroducer A ControlFunction that acts as the Control Sequence Introducer (CSI)
-     * @return ControlSequence              self, for chaining
-     */
-    public function setControlSequenceIntroducer($controlSequenceIntroducer)
-    {
-        // Make sure it's a ControlFunction instance
-        if (is_string($controlSequenceIntroducer)) {
-            $controlSequenceIntroducer = new ControlFunction($controlSequenceIntroducer);
-        }
-
-        // @TODO: Check Validity
-        $this->controlSequenceIntroducer = $controlSequenceIntroducer;
-
-        return $this;
-    }
-
-    /**
-     * Gets the CSI
-     * @return string The CSI
-     */
-    public function getControlSequenceIntroducer()
-    {
-        return $this->controlSequenceIntroducer;
-    }
-
-    /**
-     * Build and return the ANSI Code
-     * @return string The ANSI Code
-     */
-    public function get()
-    {
-        $toReturn = '';
-
-        // Append CSI
-        $toReturn = $this->controlSequenceIntroducer->get().'[';
-
-        // Append Parameter Byte (if any)
-        if (isset($this->parameterBytes) && sizeof((array) $this->parameterBytes) > 0) {
-            $toReturn .= implode(';', $this->parameterBytes);
-        }
-
-        // Append Intermediate Bytes (if any)
-        if (isset($this->intermediateBytes) && sizeof((array) $this->intermediateBytes) > 0) {
-            $toReturn .= implode(';', $this->intermediateBytes); // @TODO: Verify that ';' is the glue for intermediate bytes
-        }
-
-        // Append Final Byte (if any)
-        if (isset($this->finalByte)) {
-            $toReturn .= $this->getFinalByte();
-        }
-
-        return $toReturn;
-    }
-
-    /**
-     * Return the ANSI Code upon __toString
-     * @return string The ANSI Code
-     */
-    public function __toString()
-    {
-        return $this->get();
-    }
-
-    /**
-     * Echo the ANSI Code
-     */
-    public function e()
-    {
-        echo $this->get();
-    }
-}
-
-// EOF
+<?php
+/**
+ * ANSI Control Sequence
+ *
+ * A string of bit combinations starting with the control
+ * function CONTROL SEQUENCE INTRODUCER (CSI), and used for
+ * the coded representation of control functions with
+ * or without parameters.
+ */
+namespace Bramus\Ansi\ControlSequences;
+
+class Base
+{
+    /**
+     * A ControlFunction that acts as the Control Sequence Introducer (CSI)
+     * @var \Bramus\Ansi\ControlFunction
+     */
+    protected $controlSequenceIntroducer;
+
+    /**
+     * ANSI Control Sequence
+     * @param \Bramus\Ansi\ControlFunction $controlSequenceIntroducer A ControlFunction that acts as the Control Sequence Introducer (CSI)
+     * @param boolean                      $outputNow                 Output the resulting ANSI Code right now?
+     */
+    public function __construct($controlSequenceIntroducer)
+    {
+        // Store datamembers
+        $this->setControlSequenceIntroducer($controlSequenceIntroducer);
+    }
+
+    /**
+     * Set the control sequence introducer
+     * @param  \Bramus\Ansi\ControlFunction $controlSequenceIntroducer A ControlFunction that acts as the Control Sequence Introducer (CSI)
+     * @return ControlSequence              self, for chaining
+     */
+    public function setControlSequenceIntroducer($controlSequenceIntroducer)
+    {
+        // Make sure it's a ControlFunction instance
+        if (is_string($controlSequenceIntroducer)) {
+            $controlSequenceIntroducer = new ControlFunction($controlSequenceIntroducer);
+        }
+
+        // @TODO: Check Validity
+        $this->controlSequenceIntroducer = $controlSequenceIntroducer;
+
+        return $this;
+    }
+
+    /**
+     * Gets the CSI
+     * @return string The CSI
+     */
+    public function getControlSequenceIntroducer()
+    {
+        return $this->controlSequenceIntroducer;
+    }
+
+    /**
+     * Build and return the ANSI Code
+     * @return string The ANSI Code
+     */
+    public function get()
+    {
+        $toReturn = '';
+
+        // Append CSI
+        $toReturn = $this->controlSequenceIntroducer->get().'[';
+
+        // Append Parameter Byte (if any)
+        if (isset($this->parameterBytes) && sizeof((array) $this->parameterBytes) > 0) {
+            $toReturn .= implode(';', $this->parameterBytes);
+        }
+
+        // Append Intermediate Bytes (if any)
+        if (isset($this->intermediateBytes) && sizeof((array) $this->intermediateBytes) > 0) {
+            $toReturn .= implode(';', $this->intermediateBytes); // @TODO: Verify that ';' is the glue for intermediate bytes
+        }
+
+        // Append Final Byte (if any)
+        if (isset($this->finalByte)) {
+            $toReturn .= $this->getFinalByte();
+        }
+
+        return $toReturn;
+    }
+
+    /**
+     * Return the ANSI Code upon __toString
+     * @return string The ANSI Code
+     */
+    public function __toString()
+    {
+        return $this->get();
+    }
+
+    /**
+     * Echo the ANSI Code
+     */
+    public function e()
+    {
+        echo $this->get();
+    }
+}
+
+// EOF

+ 30 - 30
vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/Base.php

@@ -1,30 +1,30 @@
-<?php
-/**
- * ANSI Escape Sequence
- *
- * A string of bit combinations that is used for control purposes in
- * code extension procedures. The first of these bit combinations
- * represents the control function ESCAPE.
- */
-namespace Bramus\Ansi\ControlSequences\EscapeSequences;
-
-class Base extends \Bramus\Ansi\ControlSequences\Base
-{
-    // Escape Sequences have a final byte
-    use \Bramus\Ansi\ControlSequences\Traits\HasFinalByte;
-
-    /**
-     * ANSI Escape Sequence
-     * @param string  $finalByte The Final Byte of the Escape Sequence
-     */
-    public function __construct($finalByte)
-    {
-        // Store the final byte
-        $this->setFinalByte($finalByte);
-
-        // Call Parent Constructor
-        parent::__construct(
-            new \Bramus\Ansi\ControlFunctions\Escape()
-        );
-    }
-}
+<?php
+/**
+ * ANSI Escape Sequence
+ *
+ * A string of bit combinations that is used for control purposes in
+ * code extension procedures. The first of these bit combinations
+ * represents the control function ESCAPE.
+ */
+namespace Bramus\Ansi\ControlSequences\EscapeSequences;
+
+class Base extends \Bramus\Ansi\ControlSequences\Base
+{
+    // Escape Sequences have a final byte
+    use \Bramus\Ansi\ControlSequences\Traits\HasFinalByte;
+
+    /**
+     * ANSI Escape Sequence
+     * @param string  $finalByte The Final Byte of the Escape Sequence
+     */
+    public function __construct($finalByte)
+    {
+        // Store the final byte
+        $this->setFinalByte($finalByte);
+
+        // Call Parent Constructor
+        parent::__construct(
+            new \Bramus\Ansi\ControlFunctions\Escape()
+        );
+    }
+}

+ 31 - 0
vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/CUB.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * CUB - CURSOR BACK
+ * 
+ * CUB causes the active presentation position to be moved leftwards
+ * in the presentation component by n character positions if the
+ * character path is horizontal, or by n line positions if the
+ * character path is vertical, where n equals the value of Pn.
+ */
+namespace Bramus\Ansi\ControlSequences\EscapeSequences;
+
+class CUB extends Base
+{
+    // This EscapeSequence has ParameterByte(s)
+    use \Bramus\Ansi\ControlSequences\Traits\HasParameterBytes;
+
+    /**
+     * CUB - CURSOR BACK
+     * @param mixed   $parameterBytes The Parameter Bytes
+     */
+    public function __construct($parameterBytes = 1)
+    {
+        // Store the parameter bytes
+        $this->setParameterBytes($parameterBytes);
+
+        // Call Parent Constructor (which will store finalByte)
+        parent::__construct(
+            \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte::CUB
+        );
+    }
+}

+ 31 - 0
vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/CUD.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * CUD - CURSOR DOWN
+ * 
+ * CUD causes the active presentation position to be moved downwards
+ * in the presentation component by n line positions if the character
+ * path is horizontal, or by n character positions if the character
+ * path is vertical, where n equals the value of Pn.
+ */
+namespace Bramus\Ansi\ControlSequences\EscapeSequences;
+
+class CUD extends Base
+{
+    // This EscapeSequence has ParameterByte(s)
+    use \Bramus\Ansi\ControlSequences\Traits\HasParameterBytes;
+
+    /**
+     * CUD - CURSOR DOWN
+     * @param mixed   $parameterBytes The Parameter Bytes
+     */
+    public function __construct($parameterBytes = 1)
+    {
+        // Store the parameter bytes
+        $this->setParameterBytes($parameterBytes);
+
+        // Call Parent Constructor (which will store finalByte)
+        parent::__construct(
+            \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte::CUD
+        );
+    }
+}

+ 31 - 0
vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/CUF.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * CUF - CURSOR FORWARD
+ * 
+ * CUF causes the active presentation position to be moved rightwards
+ * in the presentation component by n character positions if the
+ * character path is horizontal, or by n line positions if the
+ * character path is vertical, where n equals the value of Pn.
+ */
+namespace Bramus\Ansi\ControlSequences\EscapeSequences;
+
+class CUF extends Base
+{
+    // This EscapeSequence has ParameterByte(s)
+    use \Bramus\Ansi\ControlSequences\Traits\HasParameterBytes;
+
+    /**
+     * CUF - CURSOR FORWARD
+     * @param mixed   $parameterBytes The Parameter Bytes
+     */
+    public function __construct($parameterBytes = 1)
+    {
+        // Store the parameter bytes
+        $this->setParameterBytes($parameterBytes);
+
+        // Call Parent Constructor (which will store finalByte)
+        parent::__construct(
+            \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte::CUF
+        );
+    }
+}

+ 32 - 0
vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/CUP.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * CUP - CURSOR POSITION
+ * 
+ * CUP causes the active presentation position to be moved in the
+ * presentation component to the n-th line position according to the
+ * line progression and to the m-th character position according to
+ * the character path, where n equals the value of Pn1 and m equals
+ * the value of Pn2.
+ */
+namespace Bramus\Ansi\ControlSequences\EscapeSequences;
+
+class CUP extends Base
+{
+    // This EscapeSequence has ParameterByte(s)
+    use \Bramus\Ansi\ControlSequences\Traits\HasParameterBytes;
+
+    /**
+     * CUP - CURSOR POSITION
+     * @param mixed   $parameterBytes The Parameter Bytes
+     */
+    public function __construct($parameterBytes = '1;1')
+    {
+        // Store the parameter bytes
+        $this->setParameterBytes($parameterBytes);
+
+        // Call Parent Constructor (which will store finalByte)
+        parent::__construct(
+            \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte::CUP
+        );
+    }
+}

+ 31 - 0
vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/CUU.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * CUU - CURSOR UP
+ *
+ * CUU causes the active presentation position to be moved upwards in
+ * the presentation component by n line positions if the character
+ * path is horizontal, or by n character positions if the character
+ * path is vertical, where n equals the value of Pn.
+ */
+namespace Bramus\Ansi\ControlSequences\EscapeSequences;
+
+class CUU extends Base
+{
+    // This EscapeSequence has ParameterByte(s)
+    use \Bramus\Ansi\ControlSequences\Traits\HasParameterBytes;
+
+    /**
+     * CUU - CURSOR UP
+     * @param mixed   $parameterBytes The Parameter Bytes
+     */
+    public function __construct($parameterBytes = 1)
+    {
+        // Store the parameter bytes
+        $this->setParameterBytes($parameterBytes);
+
+        // Call Parent Constructor (which will store finalByte)
+        parent::__construct(
+            \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte::CUU
+        );
+    }
+}

+ 31 - 31
vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/ED.php

@@ -1,31 +1,31 @@
-<?php
-/**
- * ED - ERASE DISPLAY (ERASE IN PAGE)
- *
- * ED causes some or all character positions of the active page
- * (the page which contains the active presentation position in the
- * presentation component) to be put into the erased state, depending
- * on the parameter values
- */
-namespace Bramus\Ansi\ControlSequences\EscapeSequences;
-
-class ED extends Base
-{
-    // This EscapeSequence has ParameterByte(s)
-    use \Bramus\Ansi\ControlSequences\Traits\HasParameterBytes;
-
-    /**
-     * ED - ERASE DISPLAY (ERASE IN PAGE)
-     * @param mixed   $parameterBytes The Parameter Bytes
-     */
-    public function __construct($parameterBytes)
-    {
-        // Store the parameter bytes
-        $this->setParameterBytes($parameterBytes);
-
-        // Call Parent Constructor (which will store finalByte)
-        parent::__construct(
-            \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte::ED
-        );
-    }
-}
+<?php
+/**
+ * ED - ERASE DISPLAY (ERASE IN PAGE)
+ *
+ * ED causes some or all character positions of the active page
+ * (the page which contains the active presentation position in the
+ * presentation component) to be put into the erased state, depending
+ * on the parameter values
+ */
+namespace Bramus\Ansi\ControlSequences\EscapeSequences;
+
+class ED extends Base
+{
+    // This EscapeSequence has ParameterByte(s)
+    use \Bramus\Ansi\ControlSequences\Traits\HasParameterBytes;
+
+    /**
+     * ED - ERASE DISPLAY (ERASE IN PAGE)
+     * @param mixed   $parameterBytes The Parameter Bytes
+     */
+    public function __construct($parameterBytes)
+    {
+        // Store the parameter bytes
+        $this->setParameterBytes($parameterBytes);
+
+        // Call Parent Constructor (which will store finalByte)
+        parent::__construct(
+            \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte::ED
+        );
+    }
+}

+ 31 - 31
vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/EL.php

@@ -1,31 +1,31 @@
-<?php
-/**
- * EL - ERASE IN LINE
- *
- * EL causes some or all character positions of the active line (the
- * line which contains the active data position in the data component)
- * to be put into the erased state, depending on the parameter values
- *
- */
-namespace Bramus\Ansi\ControlSequences\EscapeSequences;
-
-class EL extends Base
-{
-    // This EscapeSequence has ParameterByte(s)
-    use \Bramus\Ansi\ControlSequences\Traits\HasParameterBytes;
-
-    /**
-     * EL - ERASE IN LINE
-     * @param mixed   $parameterBytes The Parameter Bytes
-     */
-    public function __construct($parameterBytes)
-    {
-        // Store the parameter bytes
-        $this->setParameterBytes($parameterBytes);
-
-        // Call Parent Constructor (which will store finalByte)
-        parent::__construct(
-            \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte::EL
-        );
-    }
-}
+<?php
+/**
+ * EL - ERASE IN LINE
+ *
+ * EL causes some or all character positions of the active line (the
+ * line which contains the active data position in the data component)
+ * to be put into the erased state, depending on the parameter values
+ *
+ */
+namespace Bramus\Ansi\ControlSequences\EscapeSequences;
+
+class EL extends Base
+{
+    // This EscapeSequence has ParameterByte(s)
+    use \Bramus\Ansi\ControlSequences\Traits\HasParameterBytes;
+
+    /**
+     * EL - ERASE IN LINE
+     * @param mixed   $parameterBytes The Parameter Bytes
+     */
+    public function __construct($parameterBytes)
+    {
+        // Store the parameter bytes
+        $this->setParameterBytes($parameterBytes);
+
+        // Call Parent Constructor (which will store finalByte)
+        parent::__construct(
+            \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte::EL
+        );
+    }
+}

+ 26 - 26
vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/Enums/ED.php

@@ -1,26 +1,26 @@
-<?php
-/**
- * Possible Parameter Byte Values for ED
- */
-namespace Bramus\Ansi\ControlSequences\EscapeSequences\Enums;
-
-class ED
-{
-    /**
-     * Erases the screen from the current line down to the bottom of the screen.
-     * @type string
-     */
-    const DOWN = '0';
-
-    /**
-     * Erases the screen from the current line up to the top of the screen.
-     * @type string
-     */
-    const UP = '1';
-
-    /**
-     * Erases the screen with the background colour and moves the cursor to home.
-     * @type string
-     */
-    const ALL = '2';
-}
+<?php
+/**
+ * Possible Parameter Byte Values for ED
+ */
+namespace Bramus\Ansi\ControlSequences\EscapeSequences\Enums;
+
+class ED
+{
+    /**
+     * Erases the screen from the current line down to the bottom of the screen.
+     * @type string
+     */
+    const DOWN = '0';
+
+    /**
+     * Erases the screen from the current line up to the top of the screen.
+     * @type string
+     */
+    const UP = '1';
+
+    /**
+     * Erases the screen with the background colour and moves the cursor to home.
+     * @type string
+     */
+    const ALL = '2';
+}

+ 26 - 26
vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/Enums/EL.php

@@ -1,26 +1,26 @@
-<?php
-/**
- * Possible Parameter Byte Values for EL
- */
-namespace Bramus\Ansi\ControlSequences\EscapeSequences\Enums;
-
-class EL
-{
-    /**
-     * Erases from the current cursor position to the end of the current line.
-     * @type string
-     */
-    const TO_EOL = '0';
-
-    /**
-     * Erases from the current cursor position to the start of the current line.
-     * @type string
-     */
-    const TO_SOL = '1';
-
-    /**
-     * Erases the entire current line.
-     * @type string
-     */
-    const ALL = '2';
-}
+<?php
+/**
+ * Possible Parameter Byte Values for EL
+ */
+namespace Bramus\Ansi\ControlSequences\EscapeSequences\Enums;
+
+class EL
+{
+    /**
+     * Erases from the current cursor position to the end of the current line.
+     * @type string
+     */
+    const TO_EOL = '0';
+
+    /**
+     * Erases from the current cursor position to the start of the current line.
+     * @type string
+     */
+    const TO_SOL = '1';
+
+    /**
+     * Erases the entire current line.
+     * @type string
+     */
+    const ALL = '2';
+}

+ 111 - 49
vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/Enums/FinalByte.php

@@ -1,49 +1,111 @@
-<?php
-/**
- * Possible Final Byte Values for Escape Sequences
- */
-namespace Bramus\Ansi\ControlSequences\EscapeSequences\Enums;
-
-class FinalByte
-{
-    /**
-     * ED - ERASE DISPLAY (ERASE IN PAGE)
-     *
-     * ED causes some or all character positions of the active page
-     * (the page which contains the active presentation position in the
-     * presentation component) to be put into the erased state, depending
-     * on the parameter values
-     *
-     * @type string
-     */
-    const ED = 'J';
-
-    /**
-     * EL - ERASE IN LINE
-     *
-     * EL causes some or all character positions of the active line (the
-     * line which contains the active data position in the data component)
-     * to be put into the erased state, depending on the parameter values
-     *
-     * @type string
-     */
-    const EL = 'K';
-
-    /**
-     * SGR - SELECT GRAPHIC RENDITION
-     *
-     * SGR is used to establish one or more graphic rendition aspects for
-     * subsequent text. The established aspects remain in effect until the
-     * next occurrence of SGR in the data stream, depending on the setting
-     * of the GRAPHIC RENDITION COMBINATION MODE (GRCM). Each graphic
-     * rendition aspect is specified by a parameter value
-     *
-     * @type string
-     */
-    const SGR = 'm';
-
-    // @TODO: Add more Escape Code Final Bytes
-    // @see http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-048.pdf
-    // @see http://www.termsys.demon.co.uk/vtansi.htm
-    // @see http://en.wikipedia.org/wiki/ANSI_escape_code
-}
+<?php
+/**
+ * Possible Final Byte Values for Escape Sequences
+ */
+namespace Bramus\Ansi\ControlSequences\EscapeSequences\Enums;
+
+class FinalByte
+{
+
+    /**
+     * CUB - CURSOR BACK
+     * 
+     * CUB causes the active presentation position to be moved leftwards
+     * in the presentation component by n character positions if the
+     * character path is horizontal, or by n line positions if the
+     * character path is vertical, where n equals the value of Pn.
+     * 
+     * @type string
+     */
+    const CUB = 'D';
+
+    /**
+     * CUD - CURSOR DOWN
+     * 
+     * CUD causes the active presentation position to be moved downwards
+     * in the presentation component by n line positions if the character
+     * path is horizontal, or by n character positions if the character
+     * path is vertical, where n equals the value of Pn.
+     * 
+     * @type string
+     */
+    const CUD = 'B';
+
+    /**
+     * CUF - CURSOR FORWARD
+     * 
+     * CUF causes the active presentation position to be moved rightwards
+     * in the presentation component by n character positions if the
+     * character path is horizontal, or by n line positions if the
+     * character path is vertical, where n equals the value of Pn.
+     * 
+     * @type string
+     */
+    const CUF = 'C';
+
+    /**
+     * CUP - CURSOR POSITION
+     * 
+     * CUP causes the active presentation position to be moved in the
+     * presentation component to the n-th line position according to the
+     * line progression and to the m-th character position according to
+     * the character path, where n equals the value of Pn1 and m equals
+     * the value of Pn2.
+     * 
+     * @type string
+     */
+    const CUP = 'H';
+
+    /**
+     * CUU - CURSOR UP 
+     *
+     * CUU causes the active presentation position to be moved upwards in
+     * the presentation component by n line positions if the character
+     * path is horizontal, or by n character positions if the character
+     * path is vertical, where n equals the value of Pn.
+     * 
+     * @type string
+     */
+    const CUU = 'A';
+
+    /**
+     * ED - ERASE DISPLAY (ERASE IN PAGE)
+     *
+     * ED causes some or all character positions of the active page
+     * (the page which contains the active presentation position in the
+     * presentation component) to be put into the erased state, depending
+     * on the parameter values
+     *
+     * @type string
+     */
+    const ED = 'J';
+
+    /**
+     * EL - ERASE IN LINE
+     *
+     * EL causes some or all character positions of the active line (the
+     * line which contains the active data position in the data component)
+     * to be put into the erased state, depending on the parameter values
+     *
+     * @type string
+     */
+    const EL = 'K';
+
+    /**
+     * SGR - SELECT GRAPHIC RENDITION
+     *
+     * SGR is used to establish one or more graphic rendition aspects for
+     * subsequent text. The established aspects remain in effect until the
+     * next occurrence of SGR in the data stream, depending on the setting
+     * of the GRAPHIC RENDITION COMBINATION MODE (GRCM). Each graphic
+     * rendition aspect is specified by a parameter value
+     *
+     * @type string
+     */
+    const SGR = 'm';
+
+    // @TODO: Add more Escape Code Final Bytes
+    // @see https://www.ecma-international.org/publications-and-standards/standards/ecma-48/
+    // @see https://www2.ccs.neu.edu/research/gpc/VonaUtils/vona/terminal/vtansi.htm
+    // @see https://en.wikipedia.org/wiki/ANSI_escape_code
+}

+ 385 - 385
vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/Enums/SGR.php

@@ -1,385 +1,385 @@
-<?php
-/**
- * Possible Parameter Byte Values for SGR
- */
-namespace Bramus\Ansi\ControlSequences\EscapeSequences\Enums;
-
-class SGR
-{
-    /**
-     * Default rendition, cancels the effect of any preceding occurrence of SGR in the data stream
-     * @type string
-     */
-    const STYLE_NONE = '0';
-
-    /**
-     * Bold: On ~or~ increased intensity
-     * @type string
-     */
-    const STYLE_INTENSITY_BRIGHT = '1';
-
-    /**
-     * Bold: On ~or~ increased intensity
-     * @type string
-     */
-    const STYLE_BOLD = '1';
-
-    /**
-     * Faint, decreased intensity
-     * @note Not widely supported
-     * @type string
-     */
-    const STYLE_INTENSITY_FAINT = '2';
-
-    /**
-     * Italic: On
-     * @note Not widely supported
-     * @type string
-     */
-    const STYLE_ITALIC = '3';
-
-    /**
-     * Underline: On
-     * @type string
-     */
-    const STYLE_UNDERLINE = '4';
-
-    /**
-     * Blink: On
-     * @type string
-     */
-    const STYLE_BLINK = '5';
-
-    /**
-     * Blink (Rapid): On
-     * @note Not widely supported
-     * @type string
-     */
-    const STYLE_BLINK_RAPID = '6';
-
-    /**
-     * Inverse or reverse colors (viz. swap foreground and background)
-     * @type string
-     */
-    const STYLE_NEGATIVE = '7';
-
-    /**
-     * Conceal (Hide) text
-     * @note Not widely supported
-     * @type string
-     */
-    const STYLE_CONCEAL = '8';
-
-    /**
-     * Cross-out / strikethrough: On
-     * @note Not widely supported
-     * @type string
-     */
-    const STYLE_STRIKETHROUGH = '9';
-
-    /**
-     * Bold: Off ~or~ normal intensity
-     * @type string
-     */
-    const STYLE_INTENSITY_NORMAL = '22';
-
-    /**
-     * Bold: Off ~or~ normal intensity
-     * @type string
-     */
-    const STYLE_BOLD_OFF = '22';
-
-    /**
-     * Italic: Off
-     * @note Not widely supported
-     * @type string
-     */
-    const STYLE_ITALIC_OFF = '23';
-
-    /**
-     * Underline: Off
-     * @type string
-     */
-    const STYLE_UNDERLINE_OFF = '24';
-
-    /**
-     * Blink: Off (Steady)
-     * @type string
-     */
-    const STYLE_STEADY = '5';
-    const STYLE_BLINK_OFF = '5';
-
-    /**
-     * Positive Image (viz. don't swap foreground and background)
-     * @type string
-     */
-    const STYLE_POSITIVE = '27';
-
-    /**
-     * Revealed Charcters (inverse of CONCEAL)
-     * @type string
-     */
-    const STYLE_REVEAL = '28';
-
-    /**
-     * Strikethrough: Off
-     * @note Not widely supported
-     * @type string
-     */
-    const STYLE_STRIKETHROUGH_OFF = '29';
-
-    /**
-     * Black Foreground Color
-     * @type string
-     */
-    const COLOR_FG_BLACK = '30';
-
-    /**
-     * Red Foreground Color
-     * @type string
-     */
-    const COLOR_FG_RED = '31';
-
-    /**
-     * Green Foreground Color
-     * @type string
-     */
-    const COLOR_FG_GREEN = '32';
-
-    /**
-     * Yellow Foreground Color
-     * @type string
-     */
-    const COLOR_FG_YELLOW = '33';
-
-    /**
-     * Blue Foreground Color
-     * @type string
-     */
-    const COLOR_FG_BLUE = '34';
-
-    /**
-     * Purple Foreground Color
-     * @type string
-     */
-    const COLOR_FG_PURPLE = '35';
-
-    /**
-     * Cyan Foreground Color
-     * @type string
-     */
-    const COLOR_FG_CYAN = '36';
-
-    /**
-     * White Foreground Color
-     * @type string
-     */
-    const COLOR_FG_WHITE = '37';
-
-    /**
-     * Default Foreground Color
-     * @type string
-     */
-    const COLOR_FG_RESET = '39';
-
-    /**
-     * Black Background Color
-     * @type string
-     */
-    const COLOR_BG_BLACK = '40';
-
-    /**
-     * Red Background Color
-     * @type string
-     */
-    const COLOR_BG_RED = '41';
-
-    /**
-     * Green Background Color
-     * @type string
-     */
-    const COLOR_BG_GREEN = '42';
-
-    /**
-     * Yellow Background Color
-     * @type string
-     */
-    const COLOR_BG_YELLOW = '43';
-
-    /**
-     * Blue Background Color
-     * @type string
-     */
-    const COLOR_BG_BLUE = '44';
-
-    /**
-     * Purple Background Color
-     * @type string
-     */
-    const COLOR_BG_PURPLE = '45';
-
-    /**
-     * Cyan Background Color
-     * @type string
-     */
-    const COLOR_BG_CYAN = '46';
-
-    /**
-     * White Background Color
-     * @type string
-     */
-    const COLOR_BG_WHITE = '47';
-
-    /**
-     * Default Background Color
-     * @type string
-     */
-    const COLOR_BG_RESET = '49';
-
-    /**
-     * Framed: On
-     * @note Not widely supported
-     * @type string
-     */
-    const STYLE_FRAMED = '51';
-
-    /**
-     * Encircled
-     * @note Not widely supported
-     * @type string
-     */
-    const STYLE_ENCIRCLED = '52';
-
-    /**
-     * Overlined: On
-     * @note Not widely supported
-     * @type string
-     */
-    const STYLE_OVERLINED = '53';
-
-    /**
-     * Framed: Off
-     * @note Not widely supported
-     * @type string
-     */
-    const STYLE_FRAMED_ENCIRCLED_OFF = '54';
-
-    /**
-     * Overlined: Off
-     * @note Not widely supported
-     * @type string
-     */
-    const STYLE_OVERLINED_OFF = '55';
-
-    /**
-     * Black Foreground Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_FG_BLACK_BRIGHT = '90';
-
-    /**
-     * Red Foreground Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_FG_RED_BRIGHT = '91';
-
-    /**
-     * Green Foreground Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_FG_GREEN_BRIGHT = '92';
-
-    /**
-     * Yellow Foreground Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_FG_YELLOW_BRIGHT = '93';
-
-    /**
-     * Blue Foreground Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_FG_BLUE_BRIGHT = '94';
-
-    /**
-     * Purple Foreground Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_FG_PURPLE_BRIGHT = '95';
-
-    /**
-     * Bright Foreground Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_FG_CYAN_BRIGHT = '96';
-
-    /**
-     * White Foreground Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_FG_WHITE_BRIGHT = '97';
-
-    /**
-     * Black Background Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_BG_BLACK_BRIGHT = '100';
-
-    /**
-     * Red Background Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_BG_RED_BRIGHT = '101';
-
-    /**
-     * Green Background Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_BG_GREEN_BRIGHT = '102';
-
-    /**
-     * Yellow Background Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_BG_YELLOW_BRIGHT = '103';
-
-    /**
-     * Blue Background Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_BG_BLUE_BRIGHT = '104';
-
-    /**
-     * Purple Background Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_BG_PURPLE_BRIGHT = '105';
-
-    /**
-     * Cyan Background Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_BG_CYAN_BRIGHT = '106';
-
-    /**
-     * White Background Color (High Intensity)
-     * @note Not part of the ANSI standard
-     * @type string
-     */
-    const COLOR_BG_WHITE_BRIGHT = '107';
-}
+<?php
+/**
+ * Possible Parameter Byte Values for SGR
+ */
+namespace Bramus\Ansi\ControlSequences\EscapeSequences\Enums;
+
+class SGR
+{
+    /**
+     * Default rendition, cancels the effect of any preceding occurrence of SGR in the data stream
+     * @type string
+     */
+    const STYLE_NONE = '0';
+
+    /**
+     * Bold: On ~or~ increased intensity
+     * @type string
+     */
+    const STYLE_INTENSITY_BRIGHT = '1';
+
+    /**
+     * Bold: On ~or~ increased intensity
+     * @type string
+     */
+    const STYLE_BOLD = '1';
+
+    /**
+     * Faint, decreased intensity
+     * @note Not widely supported
+     * @type string
+     */
+    const STYLE_INTENSITY_FAINT = '2';
+
+    /**
+     * Italic: On
+     * @note Not widely supported
+     * @type string
+     */
+    const STYLE_ITALIC = '3';
+
+    /**
+     * Underline: On
+     * @type string
+     */
+    const STYLE_UNDERLINE = '4';
+
+    /**
+     * Blink: On
+     * @type string
+     */
+    const STYLE_BLINK = '5';
+
+    /**
+     * Blink (Rapid): On
+     * @note Not widely supported
+     * @type string
+     */
+    const STYLE_BLINK_RAPID = '6';
+
+    /**
+     * Inverse or reverse colors (viz. swap foreground and background)
+     * @type string
+     */
+    const STYLE_NEGATIVE = '7';
+
+    /**
+     * Conceal (Hide) text
+     * @note Not widely supported
+     * @type string
+     */
+    const STYLE_CONCEAL = '8';
+
+    /**
+     * Cross-out / strikethrough: On
+     * @note Not widely supported
+     * @type string
+     */
+    const STYLE_STRIKETHROUGH = '9';
+
+    /**
+     * Bold: Off ~or~ normal intensity
+     * @type string
+     */
+    const STYLE_INTENSITY_NORMAL = '22';
+
+    /**
+     * Bold: Off ~or~ normal intensity
+     * @type string
+     */
+    const STYLE_BOLD_OFF = '22';
+
+    /**
+     * Italic: Off
+     * @note Not widely supported
+     * @type string
+     */
+    const STYLE_ITALIC_OFF = '23';
+
+    /**
+     * Underline: Off
+     * @type string
+     */
+    const STYLE_UNDERLINE_OFF = '24';
+
+    /**
+     * Blink: Off (Steady)
+     * @type string
+     */
+    const STYLE_STEADY = '5';
+    const STYLE_BLINK_OFF = '5';
+
+    /**
+     * Positive Image (viz. don't swap foreground and background)
+     * @type string
+     */
+    const STYLE_POSITIVE = '27';
+
+    /**
+     * Revealed Charcters (inverse of CONCEAL)
+     * @type string
+     */
+    const STYLE_REVEAL = '28';
+
+    /**
+     * Strikethrough: Off
+     * @note Not widely supported
+     * @type string
+     */
+    const STYLE_STRIKETHROUGH_OFF = '29';
+
+    /**
+     * Black Foreground Color
+     * @type string
+     */
+    const COLOR_FG_BLACK = '30';
+
+    /**
+     * Red Foreground Color
+     * @type string
+     */
+    const COLOR_FG_RED = '31';
+
+    /**
+     * Green Foreground Color
+     * @type string
+     */
+    const COLOR_FG_GREEN = '32';
+
+    /**
+     * Yellow Foreground Color
+     * @type string
+     */
+    const COLOR_FG_YELLOW = '33';
+
+    /**
+     * Blue Foreground Color
+     * @type string
+     */
+    const COLOR_FG_BLUE = '34';
+
+    /**
+     * Purple Foreground Color
+     * @type string
+     */
+    const COLOR_FG_PURPLE = '35';
+
+    /**
+     * Cyan Foreground Color
+     * @type string
+     */
+    const COLOR_FG_CYAN = '36';
+
+    /**
+     * White Foreground Color
+     * @type string
+     */
+    const COLOR_FG_WHITE = '37';
+
+    /**
+     * Default Foreground Color
+     * @type string
+     */
+    const COLOR_FG_RESET = '39';
+
+    /**
+     * Black Background Color
+     * @type string
+     */
+    const COLOR_BG_BLACK = '40';
+
+    /**
+     * Red Background Color
+     * @type string
+     */
+    const COLOR_BG_RED = '41';
+
+    /**
+     * Green Background Color
+     * @type string
+     */
+    const COLOR_BG_GREEN = '42';
+
+    /**
+     * Yellow Background Color
+     * @type string
+     */
+    const COLOR_BG_YELLOW = '43';
+
+    /**
+     * Blue Background Color
+     * @type string
+     */
+    const COLOR_BG_BLUE = '44';
+
+    /**
+     * Purple Background Color
+     * @type string
+     */
+    const COLOR_BG_PURPLE = '45';
+
+    /**
+     * Cyan Background Color
+     * @type string
+     */
+    const COLOR_BG_CYAN = '46';
+
+    /**
+     * White Background Color
+     * @type string
+     */
+    const COLOR_BG_WHITE = '47';
+
+    /**
+     * Default Background Color
+     * @type string
+     */
+    const COLOR_BG_RESET = '49';
+
+    /**
+     * Framed: On
+     * @note Not widely supported
+     * @type string
+     */
+    const STYLE_FRAMED = '51';
+
+    /**
+     * Encircled
+     * @note Not widely supported
+     * @type string
+     */
+    const STYLE_ENCIRCLED = '52';
+
+    /**
+     * Overlined: On
+     * @note Not widely supported
+     * @type string
+     */
+    const STYLE_OVERLINED = '53';
+
+    /**
+     * Framed: Off
+     * @note Not widely supported
+     * @type string
+     */
+    const STYLE_FRAMED_ENCIRCLED_OFF = '54';
+
+    /**
+     * Overlined: Off
+     * @note Not widely supported
+     * @type string
+     */
+    const STYLE_OVERLINED_OFF = '55';
+
+    /**
+     * Black Foreground Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_FG_BLACK_BRIGHT = '90';
+
+    /**
+     * Red Foreground Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_FG_RED_BRIGHT = '91';
+
+    /**
+     * Green Foreground Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_FG_GREEN_BRIGHT = '92';
+
+    /**
+     * Yellow Foreground Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_FG_YELLOW_BRIGHT = '93';
+
+    /**
+     * Blue Foreground Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_FG_BLUE_BRIGHT = '94';
+
+    /**
+     * Purple Foreground Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_FG_PURPLE_BRIGHT = '95';
+
+    /**
+     * Bright Foreground Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_FG_CYAN_BRIGHT = '96';
+
+    /**
+     * White Foreground Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_FG_WHITE_BRIGHT = '97';
+
+    /**
+     * Black Background Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_BG_BLACK_BRIGHT = '100';
+
+    /**
+     * Red Background Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_BG_RED_BRIGHT = '101';
+
+    /**
+     * Green Background Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_BG_GREEN_BRIGHT = '102';
+
+    /**
+     * Yellow Background Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_BG_YELLOW_BRIGHT = '103';
+
+    /**
+     * Blue Background Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_BG_BLUE_BRIGHT = '104';
+
+    /**
+     * Purple Background Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_BG_PURPLE_BRIGHT = '105';
+
+    /**
+     * Cyan Background Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_BG_CYAN_BRIGHT = '106';
+
+    /**
+     * White Background Color (High Intensity)
+     * @note Not part of the ANSI standard
+     * @type string
+     */
+    const COLOR_BG_WHITE_BRIGHT = '107';
+}

+ 37 - 37
vendor/bramus/ansi-php/src/ControlSequences/EscapeSequences/SGR.php

@@ -1,37 +1,37 @@
-<?php
-/**
- * SGR - SELECT GRAPHIC RENDITION
- *
- * SGR is used to establish one or more graphic rendition aspects for
- * subsequent text. The established aspects remain in effect until the
- * next occurrence of SGR in the data stream, depending on the setting
- * of the GRAPHIC RENDITION COMBINATION MODE (GRCM). Each graphic
- * rendition aspect is specified by a parameter value
- */
-namespace Bramus\Ansi\ControlSequences\EscapeSequences;
-
-class SGR extends Base
-{
-    // This EscapeSequence has ParameterByte(s)
-    use \Bramus\Ansi\ControlSequences\Traits\HasParameterBytes;
-
-    /**
-     * SGR - SELECT GRAPHIC RENDITION
-     * @param mixed   $parameterBytes The Parameter Bytes
-     */
-    public function __construct($parameterBytes = null)
-    {
-        // Make sure we have parameter bytes
-        if (!$parameterBytes) {
-            $parameterBytes = array(Enums\SGR::STYLE_NONE);
-        }
-
-        // Store the parameter bytes
-        $this->setParameterBytes($parameterBytes);
-
-        // Call Parent Constructor (which will store finalByte)
-        parent::__construct(
-            \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte::SGR
-        );
-    }
-}
+<?php
+/**
+ * SGR - SELECT GRAPHIC RENDITION
+ *
+ * SGR is used to establish one or more graphic rendition aspects for
+ * subsequent text. The established aspects remain in effect until the
+ * next occurrence of SGR in the data stream, depending on the setting
+ * of the GRAPHIC RENDITION COMBINATION MODE (GRCM). Each graphic
+ * rendition aspect is specified by a parameter value
+ */
+namespace Bramus\Ansi\ControlSequences\EscapeSequences;
+
+class SGR extends Base
+{
+    // This EscapeSequence has ParameterByte(s)
+    use \Bramus\Ansi\ControlSequences\Traits\HasParameterBytes;
+
+    /**
+     * SGR - SELECT GRAPHIC RENDITION
+     * @param mixed   $parameterBytes The Parameter Bytes
+     */
+    public function __construct($parameterBytes = null)
+    {
+        // Make sure we have parameter bytes
+        if (!$parameterBytes) {
+            $parameterBytes = array(Enums\SGR::STYLE_NONE);
+        }
+
+        // Store the parameter bytes
+        $this->setParameterBytes($parameterBytes);
+
+        // Call Parent Constructor (which will store finalByte)
+        parent::__construct(
+            \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte::SGR
+        );
+    }
+}

+ 34 - 34
vendor/bramus/ansi-php/src/ControlSequences/Traits/HasFinalByte.php

@@ -1,34 +1,34 @@
-<?php
-
-namespace Bramus\Ansi\ControlSequences\Traits;
-
-trait HasFinalByte
-{
-    /**
-     * Final Byte: The bit combination that terminates an escape sequence or a control sequence.
-     * @var string
-     */
-    protected $finalByte;
-
-    /**
-     * Set the finalByte
-     * @param  string $finalByte The bit combination that terminates an escape sequence or a control sequence.
-     * @return Base   self, for chaining
-     */
-    public function setFinalByte($finalByte)
-    {
-        // @TODO Verify Validity
-        $this->finalByte = $finalByte;
-
-        return $this;
-    }
-
-    /**
-     * Get the Final Byte
-     * @return string
-     */
-    public function getFinalByte()
-    {
-        return $this->finalByte;
-    }
-}
+<?php
+
+namespace Bramus\Ansi\ControlSequences\Traits;
+
+trait HasFinalByte
+{
+    /**
+     * Final Byte: The bit combination that terminates an escape sequence or a control sequence.
+     * @var string
+     */
+    protected $finalByte;
+
+    /**
+     * Set the finalByte
+     * @param  string $finalByte The bit combination that terminates an escape sequence or a control sequence.
+     * @return Base   self, for chaining
+     */
+    public function setFinalByte($finalByte)
+    {
+        // @TODO Verify Validity
+        $this->finalByte = $finalByte;
+
+        return $this;
+    }
+
+    /**
+     * Get the Final Byte
+     * @return string
+     */
+    public function getFinalByte()
+    {
+        return $this->finalByte;
+    }
+}

+ 52 - 52
vendor/bramus/ansi-php/src/ControlSequences/Traits/HasIntermediateBytes.php

@@ -1,52 +1,52 @@
-<?php
-
-namespace Bramus\Ansi\ControlSequences\Traits;
-
-trait HasIntermediateBytes
-{
-    /**
-     * Intermediate Byte: In a control sequence, a bit combination that may occur between the ControlFunction CSI and the Final Byte, or between a Parameter Byte and the Final Byte.
-     * @var array
-     */
-    protected $intermediateBytes = array();
-
-    /**
-     * Add a Intermediate Byte
-     * @param  string $intermediateByte The byte to add
-     * @return Base   self, for chaining
-     */
-    public function addIntermediateByte($intermediateByte)
-    {
-        $this->intermediateBytes[] = (string) $intermediateByte;
-
-        return $this;
-    }
-
-    /**
-     * Set the Intermediate Byte
-     * @param  array $parameterByte The byte to add
-     * @return Base  self, for chaining
-     */
-    public function setIntermediateBytes($intermediateBytes)
-    {
-        foreach ((array) $intermediateBytes as $byte) {
-            $this->addIntermediateByte($byte);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the Intermediate Byte
-     * @param  bool $asString As a string, or as an array?
-     * @return Base self, for chaining
-     */
-    public function getIntermediateBytes($asString = true)
-    {
-        if ($asString === true) {
-            return implode($this->intermediateBytes);
-        } else {
-            return $this->intermediateBytes;
-        }
-    }
-}
+<?php
+
+namespace Bramus\Ansi\ControlSequences\Traits;
+
+trait HasIntermediateBytes
+{
+    /**
+     * Intermediate Byte: In a control sequence, a bit combination that may occur between the ControlFunction CSI and the Final Byte, or between a Parameter Byte and the Final Byte.
+     * @var array
+     */
+    protected $intermediateBytes = array();
+
+    /**
+     * Add a Intermediate Byte
+     * @param  string $intermediateByte The byte to add
+     * @return Base   self, for chaining
+     */
+    public function addIntermediateByte($intermediateByte)
+    {
+        $this->intermediateBytes[] = (string) $intermediateByte;
+
+        return $this;
+    }
+
+    /**
+     * Set the Intermediate Byte
+     * @param  array $parameterByte The byte to add
+     * @return Base  self, for chaining
+     */
+    public function setIntermediateBytes($intermediateBytes)
+    {
+        foreach ((array) $intermediateBytes as $byte) {
+            $this->addIntermediateByte($byte);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the Intermediate Byte
+     * @param  bool $asString As a string, or as an array?
+     * @return Base self, for chaining
+     */
+    public function getIntermediateBytes($asString = true)
+    {
+        if ($asString === true) {
+            return implode($this->intermediateBytes);
+        } else {
+            return $this->intermediateBytes;
+        }
+    }
+}

+ 52 - 52
vendor/bramus/ansi-php/src/ControlSequences/Traits/HasParameterBytes.php

@@ -1,52 +1,52 @@
-<?php
-
-namespace Bramus\Ansi\ControlSequences\Traits;
-
-trait HasParameterBytes
-{
-    /**
-     * Parameter Byte: In a control sequence, a bit combination that may occur between the ControlFunction CSI and the Final Byte, or between CSI and an Intermediate Byte.
-     * @var array
-     */
-    protected $parameterBytes = array();
-
-    /**
-     * Add a Parameter Byte
-     * @param  string $parameterByte The byte to add
-     * @return Base   self, for chaining
-     */
-    public function addParameterByte($parameterByte)
-    {
-        $this->parameterBytes[] = (string) $parameterByte;
-
-        return $this;
-    }
-
-    /**
-     * Set the Parameter Byte
-     * @param  array $parameterByte The byte to add
-     * @return Base  self, for chaining
-     */
-    public function setParameterBytes($parameterBytes)
-    {
-        foreach ((array) $parameterBytes as $byte) {
-            $this->addParameterByte($byte);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the Parameter Byte
-     * @param  bool $asString As a string, or as an array?
-     * @return Base self, for chaining
-     */
-    public function getParameterBytes($asString = true)
-    {
-        if ($asString === true) {
-            return implode($this->parameterBytes);
-        } else {
-            return $this->parameterBytes;
-        }
-    }
-}
+<?php
+
+namespace Bramus\Ansi\ControlSequences\Traits;
+
+trait HasParameterBytes
+{
+    /**
+     * Parameter Byte: In a control sequence, a bit combination that may occur between the ControlFunction CSI and the Final Byte, or between CSI and an Intermediate Byte.
+     * @var array
+     */
+    protected $parameterBytes = array();
+
+    /**
+     * Add a Parameter Byte
+     * @param  string $parameterByte The byte to add
+     * @return Base   self, for chaining
+     */
+    public function addParameterByte($parameterByte)
+    {
+        $this->parameterBytes[] = (string) $parameterByte;
+
+        return $this;
+    }
+
+    /**
+     * Set the Parameter Byte
+     * @param  array $parameterByte The byte to add
+     * @return Base  self, for chaining
+     */
+    public function setParameterBytes($parameterBytes)
+    {
+        foreach ((array) $parameterBytes as $byte) {
+            $this->addParameterByte($byte);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the Parameter Byte
+     * @param  bool $asString As a string, or as an array?
+     * @return Base self, for chaining
+     */
+    public function getParameterBytes($asString = true)
+    {
+        if ($asString === true) {
+            return implode($this->parameterBytes);
+        } else {
+            return $this->parameterBytes;
+        }
+    }
+}

+ 74 - 74
vendor/bramus/ansi-php/src/Traits/ControlFunctions.php

@@ -1,74 +1,74 @@
-<?php
-
-namespace Bramus\Ansi\Traits;
-
-/**
- * Trait containing the Control Function Shorthands
- */
-trait ControlFunctions
-{
-    /**
-     * Add a Bell Control Character to the buffer / echo it on screen
-     * @return Ansi self, for chaining
-     */
-    public function bell()
-    {
-        // Write character onto writer
-        $this->writer->write(new \Bramus\Ansi\ControlFunctions\Bell());
-
-        // Afford chaining
-        return $this;
-    }
-
-    /**
-     * Add a Backspace Control Character to the buffer / echo it on screen
-     * @return Ansi self, for chaining
-     */
-    public function backspace()
-    {
-        // Write character onto writer
-        $this->writer->write(new \Bramus\Ansi\ControlFunctions\Backspace());
-
-        // Afford chaining
-        return $this;
-    }
-
-    /**
-     * Add a Tab Control Character to the buffer / echo it on screen
-     * @return Ansi self, for chaining
-     */
-    public function tab()
-    {
-        // Write character onto writer
-        $this->writer->write(new \Bramus\Ansi\ControlFunctions\Tab());
-
-        // Afford chaining
-        return $this;
-    }
-
-    /**
-     * Add a Line Feed Control Character to the buffer / echo it on screen
-     * @return Ansi self, for chaining
-     */
-    public function lf()
-    {
-        // Write character onto writer
-        $this->writer->write(new \Bramus\Ansi\ControlFunctions\LineFeed());
-
-        // Afford chaining
-        return $this;
-    }
-
-    /**
-     * Add a Carriage Return Control Character to the buffer / echo it on screen
-     * @return Ansi self, for chaining
-     */
-    public function cr()
-    {
-        // Write character onto writer
-        $this->writer->write(new \Bramus\Ansi\ControlFunctions\CarriageReturn());
-
-        // Afford chaining
-        return $this;
-    }
-}
+<?php
+
+namespace Bramus\Ansi\Traits;
+
+/**
+ * Trait containing the Control Function Shorthands
+ */
+trait ControlFunctions
+{
+    /**
+     * Add a Bell Control Character to the buffer / echo it on screen
+     * @return Ansi self, for chaining
+     */
+    public function bell()
+    {
+        // Write character onto writer
+        $this->writer->write(new \Bramus\Ansi\ControlFunctions\Bell());
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Add a Backspace Control Character to the buffer / echo it on screen
+     * @return Ansi self, for chaining
+     */
+    public function backspace()
+    {
+        // Write character onto writer
+        $this->writer->write(new \Bramus\Ansi\ControlFunctions\Backspace());
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Add a Tab Control Character to the buffer / echo it on screen
+     * @return Ansi self, for chaining
+     */
+    public function tab()
+    {
+        // Write character onto writer
+        $this->writer->write(new \Bramus\Ansi\ControlFunctions\Tab());
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Add a Line Feed Control Character to the buffer / echo it on screen
+     * @return Ansi self, for chaining
+     */
+    public function lf()
+    {
+        // Write character onto writer
+        $this->writer->write(new \Bramus\Ansi\ControlFunctions\LineFeed());
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Add a Carriage Return Control Character to the buffer / echo it on screen
+     * @return Ansi self, for chaining
+     */
+    public function cr()
+    {
+        // Write character onto writer
+        $this->writer->write(new \Bramus\Ansi\ControlFunctions\CarriageReturn());
+
+        // Afford chaining
+        return $this;
+    }
+}

+ 35 - 0
vendor/bramus/ansi-php/src/Traits/EscapeSequences/CUB.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Bramus\Ansi\Traits\EscapeSequences;
+
+/**
+ * Trait containing the CUB Escape Function Shorthands
+ */
+trait CUB
+{
+    /**
+     * Manually use CUB (Move cursor back)
+     * @param  array $data Parameter byte to the CUB Escape Code
+     * @return Ansi  self, for chaining
+     */
+    public function cub($data = 1)
+    {
+        // Write data to the writer
+        $this->writer->write(
+            new \Bramus\Ansi\ControlSequences\EscapeSequences\CUB($data)
+        );
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Move the cursor back n positions
+     * @param  integer  $n the number of positions to move the cursor
+     * @return Ansi     self, for chaining
+     */
+    public function cursorBack($n = 1)
+    {
+        return $this->cub($n);
+    }
+}

+ 35 - 0
vendor/bramus/ansi-php/src/Traits/EscapeSequences/CUD.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Bramus\Ansi\Traits\EscapeSequences;
+
+/**
+ * Trait containing the CUD Escape Function Shorthands
+ */
+trait CUD
+{
+    /**
+     * Manually use CUD (Move cursor down)
+     * @param  array $data Parameter byte to the CUD Escape Code
+     * @return Ansi  self, for chaining
+     */
+    public function cud($data = 1)
+    {
+        // Write data to the writer
+        $this->writer->write(
+            new \Bramus\Ansi\ControlSequences\EscapeSequences\CUD($data)
+        );
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Move the cursor n positions down
+     * @param  integer  $n the number of positions to move the cursor
+     * @return Ansi     self, for chaining
+     */
+    public function cursorDown($n = 1)
+    {
+        return $this->cud($n);
+    }
+}

+ 35 - 0
vendor/bramus/ansi-php/src/Traits/EscapeSequences/CUF.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Bramus\Ansi\Traits\EscapeSequences;
+
+/**
+ * Trait containing the CUF Escape Function Shorthands
+ */
+trait CUF
+{
+    /**
+     * Manually use CUF (Move cursor forward)
+     * @param  array $data Parameter byte to the CUF Escape Code
+     * @return Ansi  self, for chaining
+     */
+    public function cuf($data = 1)
+    {
+        // Write data to the writer
+        $this->writer->write(
+            new \Bramus\Ansi\ControlSequences\EscapeSequences\CUF($data)
+        );
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Move the cursor n positions forward
+     * @param  integer  $n the number of positions to move the cursor
+     * @return Ansi     self, for chaining
+     */
+    public function cursorForward($n = 1)
+    {
+        return $this->cuf($n);
+    }
+}

+ 36 - 0
vendor/bramus/ansi-php/src/Traits/EscapeSequences/CUP.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Bramus\Ansi\Traits\EscapeSequences;
+
+/**
+ * Trait containing the CUP Escape Function Shorthands
+ */
+trait CUP
+{
+    /**
+     * Manually use CUP (Cursor position)
+     * @param  array $data Parameter byte to the CUP Escape Code
+     * @return Ansi  self, for chaining
+     */
+    public function cup($data = '1;1')
+    {
+        // Write data to the writer
+        $this->writer->write(
+            new \Bramus\Ansi\ControlSequences\EscapeSequences\CUP($data)
+        );
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Move the cursor to coordinates n, m
+     * @param  integer  $n the row to move the cursor to
+     * @param  integer  $n the column to move the cursor to
+     * @return Ansi    self, for chaining
+     */
+    public function cursorPosition($n = 1, $m = 1)
+    {
+        return $this->cup("$n;$m");
+    }
+}

+ 35 - 0
vendor/bramus/ansi-php/src/Traits/EscapeSequences/CUU.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Bramus\Ansi\Traits\EscapeSequences;
+
+/**
+ * Trait containing the CUU Escape Function Shorthands
+ */
+trait CUU
+{
+    /**
+     * Manually use CUU (Move cursor up)
+     * @param  array $data Parameter byte to the CUU Escape Code
+     * @return Ansi  self, for chaining
+     */
+    public function cuu($data = 1)
+    {
+        // Write data to the writer
+        $this->writer->write(
+            new \Bramus\Ansi\ControlSequences\EscapeSequences\CUU($data)
+        );
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Move the cursor up n positions
+     * @param  integer  $n the number of positions to move the cursor
+     * @return Ansi    self, for chaining
+     */
+    public function cursorUp($n = 1)
+    {
+        return $this->cuu($n);
+    }
+}

+ 55 - 54
vendor/bramus/ansi-php/src/Traits/EscapeSequences/ED.php

@@ -1,54 +1,55 @@
-<?php
-
-namespace Bramus\Ansi\Traits\EscapeSequences;
-
-use Bramus\Ansi\ControlSequences\EscapeSequences\Enums\ED as EnumED;
-
-/**
- * Trait containing the ED Escape Function Shorthands
- */
-trait ED
-{
-    /**
-     * Manually use ED (Select Graphic Rendition)
-     * @param  array $parameterByte Parameter byte to the SGR Escape Code
-     * @return Ansi  self, for chaining
-     */
-    public function ed($data)
-    {
-        // Write data to the writer
-        $this->writer->write(
-            new \Bramus\Ansi\ControlSequences\EscapeSequences\ED($data)
-        );
-
-        // Afford chaining
-        return $this;
-    }
-
-    /**
-     * Erase the screen from the current line up to the top of the screen
-     * @return Ansi self, for chaining
-     */
-    public function eraseDisplayUp()
-    {
-        return $this->ed(EnumED::UP);
-    }
-
-    /**
-     * Erase the screen from the current line down to the bottom of the screen
-     * @return Ansi self, for chaining
-     */
-    public function eraseDisplayDown()
-    {
-        return $this->ed(EnumED::DOWN);
-    }
-
-    /**
-     * Erase the entire screen and moves the cursor to home
-     * @return Ansi self, for chaining
-     */
-    public function eraseDisplay()
-    {
-        return $this->ed(EnumED::ALL);
-    }
-}
+<?php
+
+namespace Bramus\Ansi\Traits\EscapeSequences;
+
+use Bramus\Ansi\ControlSequences\EscapeSequences\Enums\ED as EnumED;
+use Bramus\Ansi\Ansi;
+
+/**
+ * Trait containing the ED Escape Function Shorthands
+ */
+trait ED
+{
+    /**
+     * Manually use ED (Select Graphic Rendition)
+     * @param  array $data Parameter byte to the SGR Escape Code
+     * @return Ansi  self, for chaining
+     */
+    public function ed($data)
+    {
+        // Write data to the writer
+        $this->writer->write(
+            new \Bramus\Ansi\ControlSequences\EscapeSequences\ED($data)
+        );
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Erase the screen from the current line up to the top of the screen
+     * @return Ansi self, for chaining
+     */
+    public function eraseDisplayUp()
+    {
+        return $this->ed(EnumED::UP);
+    }
+
+    /**
+     * Erase the screen from the current line down to the bottom of the screen
+     * @return Ansi self, for chaining
+     */
+    public function eraseDisplayDown()
+    {
+        return $this->ed(EnumED::DOWN);
+    }
+
+    /**
+     * Erase the entire screen and moves the cursor to home
+     * @return Ansi self, for chaining
+     */
+    public function eraseDisplay()
+    {
+        return $this->ed(EnumED::ALL);
+    }
+}

+ 58 - 57
vendor/bramus/ansi-php/src/Traits/EscapeSequences/EL.php

@@ -1,57 +1,58 @@
-<?php
-
-namespace Bramus\Ansi\Traits\EscapeSequences;
-
-use Bramus\Ansi\ControlSequences\EscapeSequences\Enums\EL as EnumEL;
-
-/**
- * Trait containing the EL Escape Function Shorthands
- */
-trait EL
-{
-    /**
-     * Manually use EL (ERASE IN LINE)
-     * @param  array $parameterByte Parameter byte to the EL Escape Code
-     * @return Ansi  self, for chaining
-     */
-    public function el($data)
-    {
-        // Write data to the writer
-        $this->writer->write(
-            new \Bramus\Ansi\ControlSequences\EscapeSequences\EL($data)
-        );
-
-        // Afford chaining
-        return $this;
-    }
-
-    /**
-     * Erase from the current cursor position to the end of the current line.
-     * @param  boolean $outputNow Echo the character right now, or add it to the buffer building?
-     * @return Ansi    self, for chaining
-     */
-    public function eraseLineToEOL()
-    {
-        return $this->el(EnumEL::TO_EOL);
-    }
-
-    /**
-     * Erases from the current cursor position to the start of the current line.
-     * @param  boolean $outputNow Echo the character right now, or add it to the buffer building?
-     * @return Ansi    self, for chaining
-     */
-    public function eraseLineToSOL()
-    {
-        return $this->el(EnumEL::TO_SOL);
-    }
-
-    /**
-     * Erase the entire current line.
-     * @param  boolean $outputNow Echo the character right now, or add it to the buffer building?
-     * @return Ansi    self, for chaining
-     */
-    public function eraseLine()
-    {
-        return $this->el(EnumEL::ALL);
-    }
-}
+<?php
+
+namespace Bramus\Ansi\Traits\EscapeSequences;
+
+use Bramus\Ansi\ControlSequences\EscapeSequences\Enums\EL as EnumEL;
+use Bramus\Ansi\Ansi;
+
+/**
+ * Trait containing the EL Escape Function Shorthands
+ */
+trait EL
+{
+    /**
+     * Manually use EL (ERASE IN LINE)
+     * @param  array $data Parameter byte to the EL Escape Code
+     * @return Ansi  self, for chaining
+     */
+    public function el($data)
+    {
+        // Write data to the writer
+        $this->writer->write(
+            new \Bramus\Ansi\ControlSequences\EscapeSequences\EL($data)
+        );
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Erase from the current cursor position to the end of the current line.
+     * @param  boolean $outputNow Echo the character right now, or add it to the buffer building?
+     * @return Ansi    self, for chaining
+     */
+    public function eraseLineToEOL()
+    {
+        return $this->el(EnumEL::TO_EOL);
+    }
+
+    /**
+     * Erases from the current cursor position to the start of the current line.
+     * @param  boolean $outputNow Echo the character right now, or add it to the buffer building?
+     * @return Ansi    self, for chaining
+     */
+    public function eraseLineToSOL()
+    {
+        return $this->el(EnumEL::TO_SOL);
+    }
+
+    /**
+     * Erase the entire current line.
+     * @param  boolean $outputNow Echo the character right now, or add it to the buffer building?
+     * @return Ansi    self, for chaining
+     */
+    public function eraseLine()
+    {
+        return $this->el(EnumEL::ALL);
+    }
+}

+ 137 - 136
vendor/bramus/ansi-php/src/Traits/EscapeSequences/SGR.php

@@ -1,136 +1,137 @@
-<?php
-
-namespace Bramus\Ansi\Traits\EscapeSequences;
-
-use Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR as EnumSGR;
-
-/**
- * Trait containing the SGR Escape Function Shorthands
- */
-trait SGR
-{
-    /**
-     * Manually use SGR (Select Graphic Rendition)
-     * @param  array $parameterByte Parameter byte to the SGR Escape Code
-     * @return Ansi  self, for chaining
-     */
-    public function sgr($data = array())
-    {
-        // Write data to the writer
-        $this->writer->write(
-            new \Bramus\Ansi\ControlSequences\EscapeSequences\SGR($data)
-        );
-
-        // Afford chaining
-        return $this;
-    }
-
-    /**
-     * Shorthand to remove all text styling (colors, bold, etc)
-     * @return Ansi self, for chaining
-     */
-    public function nostyle()
-    {
-        return $this->sgr(array(EnumSGR::STYLE_NONE));
-    }
-
-    /**
-     * Shorthand to remove all text styling (colors, bold, etc)
-     * @return Ansi self, for chaining
-     */
-    public function reset()
-    {
-        return $this->nostyle();
-    }
-
-    /**
-     * Shorthand to set the color.
-     * @param  array $color The color you want to set. Use an array filled with ControlSequences\EscapeSequences\Enums\SGR::COLOR_* constants
-     * @return Ansi  self, for chaining
-     */
-    public function color($color = array())
-    {
-        return $this->sgr($color);
-    }
-
-    /**
-     * Shorthand to set make text styling to bold (on some systems bright intensity)
-     * @return Ansi self, for chaining
-     */
-    public function bold()
-    {
-        return $this->sgr(array(EnumSGR::STYLE_BOLD));
-    }
-
-    /**
-     * Shorthand to set the text intensity to bright (on some systems bold)
-     * @return Ansi self, for chaining
-     */
-    public function bright()
-    {
-        return $this->sgr(array(EnumSGR::STYLE_INTENSITY_BRIGHT));
-    }
-
-    /**
-     * Shorthand to set the text styling to normal (no bold/bright)
-     * @return Ansi self, for chaining
-     */
-    public function normal()
-    {
-        return $this->sgr(array(EnumSGR::STYLE_INTENSITY_NORMAL));
-    }
-
-    /**
-     * (Not widely supported) Shorthand to set the text intensity to faint
-     * @return Ansi self, for chaining
-     */
-    public function faint()
-    {
-        return $this->sgr(array(EnumSGR::STYLE_INTENSITY_FAINT));
-    }
-
-    /**
-     * (Not widely supported) Shorthand to set the text styling to italic
-     * @return Ansi self, for chaining
-     */
-    public function italic()
-    {
-        return $this->sgr(array(EnumSGR::STYLE_ITALIC));
-    }
-
-    /**
-     * Shorthand to set the text styling to underline
-     * @return Ansi self, for chaining
-     */
-    public function underline()
-    {
-        return $this->sgr(array(EnumSGR::STYLE_UNDERLINE));
-    }
-
-    /**
-     * Shorthand to set the text styling to blink
-     * @return Ansi self, for chaining
-     */
-    public function blink()
-    {
-        return $this->sgr(array(EnumSGR::STYLE_BLINK));
-    }
-
-    /**
-     * Shorthand to set the text styling to reserved (viz. swap background & foreground color)
-     * @return Ansi self, for chaining
-     */
-    public function negative()
-    {
-        return $this->sgr(array(EnumSGR::STYLE_NEGATIVE));
-    }
-
-    /**
-     * (Not widely supported) Shorthand to set the text styling to strikethrough
-     * @return Ansi self, for chaining
-     */
-    public function strikethrough()
-    {
-        return $this->sgr(array(EnumSGR::STYLE_STRIKETHROUGH));
-    }
-}
+<?php
+
+namespace Bramus\Ansi\Traits\EscapeSequences;
+
+use Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR as EnumSGR;
+use Bramus\Ansi\Ansi;
+
+/**
+ * Trait containing the SGR Escape Function Shorthands
+ */
+trait SGR
+{
+    /**
+     * Manually use SGR (Select Graphic Rendition)
+     * @param  array $data Parameter byte to the SGR Escape Code
+     * @return Ansi  self, for chaining
+     */
+    public function sgr($data = array())
+    {
+        // Write data to the writer
+        $this->writer->write(
+            new \Bramus\Ansi\ControlSequences\EscapeSequences\SGR($data)
+        );
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Shorthand to remove all text styling (colors, bold, etc)
+     * @return Ansi self, for chaining
+     */
+    public function nostyle()
+    {
+        return $this->sgr(array(EnumSGR::STYLE_NONE));
+    }
+
+    /**
+     * Shorthand to remove all text styling (colors, bold, etc)
+     * @return Ansi self, for chaining
+     */
+    public function reset()
+    {
+        return $this->nostyle();
+    }
+
+    /**
+     * Shorthand to set the color.
+     * @param  array $color The color you want to set. Use an array filled with ControlSequences\EscapeSequences\Enums\SGR::COLOR_* constants
+     * @return Ansi  self, for chaining
+     */
+    public function color($color = array())
+    {
+        return $this->sgr($color);
+    }
+
+    /**
+     * Shorthand to set make text styling to bold (on some systems bright intensity)
+     * @return Ansi self, for chaining
+     */
+    public function bold()
+    {
+        return $this->sgr(array(EnumSGR::STYLE_BOLD));
+    }
+
+    /**
+     * Shorthand to set the text intensity to bright (on some systems bold)
+     * @return Ansi self, for chaining
+     */
+    public function bright()
+    {
+        return $this->sgr(array(EnumSGR::STYLE_INTENSITY_BRIGHT));
+    }
+
+    /**
+     * Shorthand to set the text styling to normal (no bold/bright)
+     * @return Ansi self, for chaining
+     */
+    public function normal()
+    {
+        return $this->sgr(array(EnumSGR::STYLE_INTENSITY_NORMAL));
+    }
+
+    /**
+     * (Not widely supported) Shorthand to set the text intensity to faint
+     * @return Ansi self, for chaining
+     */
+    public function faint()
+    {
+        return $this->sgr(array(EnumSGR::STYLE_INTENSITY_FAINT));
+    }
+
+    /**
+     * (Not widely supported) Shorthand to set the text styling to italic
+     * @return Ansi self, for chaining
+     */
+    public function italic()
+    {
+        return $this->sgr(array(EnumSGR::STYLE_ITALIC));
+    }
+
+    /**
+     * Shorthand to set the text styling to underline
+     * @return Ansi self, for chaining
+     */
+    public function underline()
+    {
+        return $this->sgr(array(EnumSGR::STYLE_UNDERLINE));
+    }
+
+    /**
+     * Shorthand to set the text styling to blink
+     * @return Ansi self, for chaining
+     */
+    public function blink()
+    {
+        return $this->sgr(array(EnumSGR::STYLE_BLINK));
+    }
+
+    /**
+     * Shorthand to set the text styling to reserved (viz. swap background & foreground color)
+     * @return Ansi self, for chaining
+     */
+    public function negative()
+    {
+        return $this->sgr(array(EnumSGR::STYLE_NEGATIVE));
+    }
+
+    /**
+     * (Not widely supported) Shorthand to set the text styling to strikethrough
+     * @return Ansi self, for chaining
+     */
+    public function strikethrough()
+    {
+        return $this->sgr(array(EnumSGR::STYLE_STRIKETHROUGH));
+    }
+}

+ 61 - 61
vendor/bramus/ansi-php/src/Writers/BufferWriter.php

@@ -1,61 +1,61 @@
-<?php
-
-namespace Bramus\Ansi\Writers;
-
-/**
- * Buffers data for another WriterInterface until asked to flush the buffer to it
- */
-class BufferWriter implements WriterInterface, FlushableInterface
-{
-    /**
-     * The buffer that holds the data
-     * @var string
-     */
-    private $buffer = '';
-
-    /**
-     * Write Data
-     * @param  string          $data Data to write
-     * @return WriterInterface Self, for chaining
-     */
-    public function write($data)
-    {
-        // Add data to the buffer
-        $this->buffer .= $data;
-
-        // Afford chaining
-        return $this;
-    }
-
-    /**
-     * Get/Flush the data
-     * @param  boolean $resetAfterwards Reset the data afterwards?
-     * @return string  The data
-     */
-    public function flush($resetAfterwards = true)
-    {
-        // Get buffer contents
-        $buffer = $this->buffer;
-
-        // Clear buffer contents
-        if ($resetAfterwards) {
-            $this->clear();
-        }
-
-        // Return data that was flushed
-        return $buffer;
-    }
-
-    /**
-     * Reset/Clear the buffer
-     * @return BufferedStreamWriter self, for chaining
-     */
-    public function clear()
-    {
-        // Clear the buffer
-        $this->buffer = '';
-
-        // Afford chaining
-        return $this;
-    }
-}
+<?php
+
+namespace Bramus\Ansi\Writers;
+
+/**
+ * Buffers data for another WriterInterface until asked to flush the buffer to it
+ */
+class BufferWriter implements WriterInterface, FlushableInterface
+{
+    /**
+     * The buffer that holds the data
+     * @var string
+     */
+    private $buffer = '';
+
+    /**
+     * Write Data
+     * @param  string          $data Data to write
+     * @return WriterInterface Self, for chaining
+     */
+    public function write($data)
+    {
+        // Add data to the buffer
+        $this->buffer .= $data;
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Get/Flush the data
+     * @param  boolean $resetAfterwards Reset the data afterwards?
+     * @return string  The data
+     */
+    public function flush($resetAfterwards = true)
+    {
+        // Get buffer contents
+        $buffer = $this->buffer;
+
+        // Clear buffer contents
+        if ($resetAfterwards) {
+            $this->clear();
+        }
+
+        // Return data that was flushed
+        return $buffer;
+    }
+
+    /**
+     * Reset/Clear the buffer
+     * @return BufferedStreamWriter self, for chaining
+     */
+    public function clear()
+    {
+        // Clear the buffer
+        $this->buffer = '';
+
+        // Afford chaining
+        return $this;
+    }
+}

+ 19 - 19
vendor/bramus/ansi-php/src/Writers/FlushableInterface.php

@@ -1,19 +1,19 @@
-<?php
-
-namespace Bramus\Ansi\Writers;
-
-interface FlushableInterface
-{
-    /**
-     * Get/Flush the data
-     * @param  boolean $resetAfterwards Reset the data afterwards?
-     * @return string  The data
-     */
-    public function flush($resetAfterwards = true);
-
-    /**
-     * Reset/Clear the buffer
-     * @return BufferedStreamWriter self, for chaining
-     */
-    public function clear();
-}
+<?php
+
+namespace Bramus\Ansi\Writers;
+
+interface FlushableInterface
+{
+    /**
+     * Get/Flush the data
+     * @param  boolean $resetAfterwards Reset the data afterwards?
+     * @return string  The data
+     */
+    public function flush($resetAfterwards = true);
+
+    /**
+     * Reset/Clear the buffer
+     * @return BufferedStreamWriter self, for chaining
+     */
+    public function clear();
+}

+ 60 - 60
vendor/bramus/ansi-php/src/Writers/ProxyWriter.php

@@ -1,60 +1,60 @@
-<?php
-
-namespace Bramus\Ansi\Writers;
-
-/**
- * Writer that acts as a proxy to write to another Writer
- */
-class ProxyWriter extends BufferWriter
-{
-    /**
-     * The writer to proxy for
-     * @var WriterInterface
-     */
-    private $writer;
-
-    /**
-     * ProxyWriter — Writer that acts as a proxy to write to another Writer
-     * @param WriterInterface $writer The writer to proxy for
-     */
-    public function __construct(WriterInterface $writer)
-    {
-        // Store writer
-        $this->setWriter($writer);
-    }
-
-    /**
-     * Set the writer to proxy for
-     * @param WriterInterface $writer The writer to proxy for
-     */
-    public function setWriter(WriterInterface $writer)
-    {
-        $this->writer = $writer;
-    }
-
-    /**
-     * Get the writer we are proxying for
-     * @return WriterInterface The writer we are proxying for
-     */
-    public function getWriter()
-    {
-        return $this->writer;
-    }
-
-    /**
-     * Get/Flush the data
-     * @param  boolean $resetAfterwards Reset the data afterwards?
-     * @return string  The data
-     */
-    public function flush($resetAfterwards = true)
-    {
-        // Get the data from the buffer
-        $data = parent::flush($resetAfterwards);
-
-        // Write the data to the writer we are proxying for
-        $this->writer->write($data);
-
-        // Return the data
-        return $data;
-    }
-}
+<?php
+
+namespace Bramus\Ansi\Writers;
+
+/**
+ * Writer that acts as a proxy to write to another Writer
+ */
+class ProxyWriter extends BufferWriter
+{
+    /**
+     * The writer to proxy for
+     * @var WriterInterface
+     */
+    private $writer;
+
+    /**
+     * ProxyWriter — Writer that acts as a proxy to write to another Writer
+     * @param WriterInterface $writer The writer to proxy for
+     */
+    public function __construct(WriterInterface $writer)
+    {
+        // Store writer
+        $this->setWriter($writer);
+    }
+
+    /**
+     * Set the writer to proxy for
+     * @param WriterInterface $writer The writer to proxy for
+     */
+    public function setWriter(WriterInterface $writer)
+    {
+        $this->writer = $writer;
+    }
+
+    /**
+     * Get the writer we are proxying for
+     * @return WriterInterface The writer we are proxying for
+     */
+    public function getWriter()
+    {
+        return $this->writer;
+    }
+
+    /**
+     * Get/Flush the data
+     * @param  boolean $resetAfterwards Reset the data afterwards?
+     * @return string  The data
+     */
+    public function flush($resetAfterwards = true)
+    {
+        // Get the data from the buffer
+        $data = parent::flush($resetAfterwards);
+
+        // Write the data to the writer we are proxying for
+        $this->writer->write($data);
+
+        // Return the data
+        return $data;
+    }
+}

+ 78 - 78
vendor/bramus/ansi-php/src/Writers/StreamWriter.php

@@ -1,78 +1,78 @@
-<?php
-
-namespace Bramus\Ansi\Writers;
-
-/**
- * Writes data to a stream
- */
-class StreamWriter implements WriterInterface
-{
-    /**
-     * Stream to write to
-     * @var resource
-     */
-    private $stream;
-
-    /**
-     * Constructor
-     * @param mixed $stream Stream to write to (Default: php://stdout)
-     */
-    public function __construct($stream = 'php://stdout')
-    {
-        $this->setStream($stream);
-    }
-
-    /**
-     * Destructor
-     */
-    public function __destruct()
-    {
-        @fclose($this->stream);
-    }
-
-    /**
-     * Set the stream to write to
-     * @param mixed $stream Stream to write to
-     */
-    public function setStream($stream = null)
-    {
-        // String passed in? Try converting it to a stream
-        if (is_string($stream)) {
-            $stream = @fopen($stream, 'a');
-        }
-
-        // Make sure the stream is a resource
-        if (!is_resource($stream)) {
-            throw new \InvalidArgumentException('Invalid Stream');
-        }
-
-        // Store it
-        $this->stream = $stream;
-
-        // Afford chaining
-        return $this;
-    }
-
-    /**
-     * Get stream we are writing to
-     * @return resource Stream we are writing to
-     */
-    public function getStream()
-    {
-        return $this->stream;
-    }
-
-    /**
-     * Write Data
-     * @param  string          $data Data to write
-     * @return WriterInterface Self, for chaining
-     */
-    public function write($data)
-    {
-        // Write data on the stream
-        fwrite($this->stream, $data);
-
-        // Afford chaining
-        return $this;
-    }
-}
+<?php
+
+namespace Bramus\Ansi\Writers;
+
+/**
+ * Writes data to a stream
+ */
+class StreamWriter implements WriterInterface
+{
+    /**
+     * Stream to write to
+     * @var resource
+     */
+    private $stream;
+
+    /**
+     * Constructor
+     * @param mixed $stream Stream to write to (Default: php://stdout)
+     */
+    public function __construct($stream = 'php://stdout')
+    {
+        $this->setStream($stream);
+    }
+
+    /**
+     * Destructor
+     */
+    public function __destruct()
+    {
+        @fclose($this->stream);
+    }
+
+    /**
+     * Set the stream to write to
+     * @param mixed $stream Stream to write to
+     */
+    public function setStream($stream = null)
+    {
+        // String passed in? Try converting it to a stream
+        if (is_string($stream)) {
+            $stream = @fopen($stream, 'a');
+        }
+
+        // Make sure the stream is a resource
+        if (!is_resource($stream)) {
+            throw new \InvalidArgumentException('Invalid Stream');
+        }
+
+        // Store it
+        $this->stream = $stream;
+
+        // Afford chaining
+        return $this;
+    }
+
+    /**
+     * Get stream we are writing to
+     * @return resource Stream we are writing to
+     */
+    public function getStream()
+    {
+        return $this->stream;
+    }
+
+    /**
+     * Write Data
+     * @param  string          $data Data to write
+     * @return WriterInterface Self, for chaining
+     */
+    public function write($data)
+    {
+        // Write data on the stream
+        fwrite($this->stream, $data);
+
+        // Afford chaining
+        return $this;
+    }
+}

+ 16 - 16
vendor/bramus/ansi-php/src/Writers/WriterInterface.php

@@ -1,16 +1,16 @@
-<?php
-
-namespace Bramus\Ansi\Writers;
-
-/**
- * Writer Interface
- */
-interface WriterInterface
-{
-    /**
-     * Write Data
-     * @param  string          $data Data to write
-     * @return WriterInterface Self, for chaining
-     */
-    public function write($data);
-}
+<?php
+
+namespace Bramus\Ansi\Writers;
+
+/**
+ * Writer Interface
+ */
+interface WriterInterface
+{
+    /**
+     * Write Data
+     * @param  string          $data Data to write
+     * @return WriterInterface Self, for chaining
+     */
+    public function write($data);
+}

+ 44 - 44
vendor/bramus/ansi-php/tests/AnsiTest.php

@@ -1,45 +1,45 @@
-<?php
-
-use \Bramus\Ansi\Ansi;
-use \Bramus\Ansi\Writers\StreamWriter;
-use \Bramus\Ansi\Writers\BufferWriter;
-use \Bramus\Ansi\ControlFunctions\Enums\C0;
-
-/**
- * Test the Ansi Class and its core functions
- */
-class AnsiTest extends PHPUnit_Framework_TestCase
-{
-
-    public function testInstantiation()
-    {
-
-        // Create Ansi Instance (using default writer)
-        $a = new Ansi();
-        $this->assertInstanceOf('\Bramus\Ansi\Ansi', $a);
-        $this->assertInstanceOf('\Bramus\Ansi\Writers\StreamWriter', $a->getWriter());
-
-        // Create Ansi Instance (using custom writer)
-        $a = new Ansi(new BufferWriter());
-        $this->assertInstanceOf('\Bramus\Ansi\Ansi', $a);
-        $this->assertInstanceOf('\Bramus\Ansi\Writers\BufferWriter', $a->getWriter());
-
-    }
-
-    public function testFunctions()
-    {
-
-    }
-
-    public function testChaining()
-    {
-        $a = new Ansi(new BufferWriter());
-        $test = $a->text('foo')->text('bar')->get();
-
-        $this->assertEquals(
-            $test,
-            'foobar'
-        );
-    }
-
+<?php
+
+use \Bramus\Ansi\Ansi;
+use \Bramus\Ansi\Writers\StreamWriter;
+use \Bramus\Ansi\Writers\BufferWriter;
+use \Bramus\Ansi\ControlFunctions\Enums\C0;
+
+/**
+ * Test the Ansi Class and its core functions
+ */
+class AnsiTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testInstantiation()
+    {
+
+        // Create Ansi Instance (using default writer)
+        $a = new Ansi();
+        $this->assertInstanceOf('\Bramus\Ansi\Ansi', $a);
+        $this->assertInstanceOf('\Bramus\Ansi\Writers\StreamWriter', $a->getWriter());
+
+        // Create Ansi Instance (using custom writer)
+        $a = new Ansi(new BufferWriter());
+        $this->assertInstanceOf('\Bramus\Ansi\Ansi', $a);
+        $this->assertInstanceOf('\Bramus\Ansi\Writers\BufferWriter', $a->getWriter());
+
+    }
+
+    public function testFunctions()
+    {
+
+    }
+
+    public function testChaining()
+    {
+        $a = new Ansi(new BufferWriter());
+        $test = $a->text('foo')->text('bar')->get();
+
+        $this->assertEquals(
+            $test,
+            'foobar'
+        );
+    }
+
 }

+ 71 - 71
vendor/bramus/ansi-php/tests/ControlFunctionsTest.php

@@ -1,71 +1,71 @@
-<?php
-
-use \Bramus\Ansi\Ansi;
-use \Bramus\Ansi\Writers\BufferWriter;
-use \Bramus\Ansi\ControlFunctions\Enums\C0;
-
-/**
- * Test the Control Functions
- */
-class ControlFunctionsTest extends PHPUnit_Framework_TestCase
-{
-
-    public function testUsingGet()
-    {
-        // Base
-        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Base(C0::BS))->get(), C0::BS);
-
-        // Helper Classes
-        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Backspace())->get(), C0::BS);
-        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Backspace())->get(), C0::BACKSPACE);
-        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Bell())->get(), C0::BEL);
-        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Bell())->get(), C0::BELL);
-        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\CarriageReturn())->get(), C0::CR);
-        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Escape())->get(), C0::ESC);
-        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\LineFeed())->get(), C0::LF);
-        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Tab())->get(), C0::TAB);
-    }
-
-    public function testUsingToString()
-    {
-        // Base
-        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Base(C0::BS), C0::BS);
-
-        // Helper Classes
-        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Backspace(), C0::BS);
-        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Backspace(), C0::BACKSPACE);
-        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Bell(), C0::BEL);
-        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Bell(), C0::BELL);
-        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\CarriageReturn(), C0::CR);
-        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Escape(), C0::ESC);
-        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\LineFeed(), C0::LF);
-        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Tab(), C0::TAB);
-    }
-
-    public function testAnsiShorthands()
-    {
-        $a = new Ansi(new BufferWriter());
-
-        $this->assertEquals($a->backspace()->flush(), C0::BS);
-        $this->assertEquals($a->backspace()->flush(), C0::BACKSPACE);
-        $this->assertEquals($a->bell()->flush(), C0::BEL);
-        $this->assertEquals($a->bell()->flush(), C0::BELL);
-        $this->assertEquals($a->cr()->flush(), C0::CR);
-        $this->assertEquals($a->lf()->flush(), C0::LF);
-        $this->assertEquals($a->tab()->flush(), C0::TAB);
-    }
-
-    public function testAnsiShorthandsChaining()
-    {
-        $a = new Ansi(new BufferWriter());
-
-        // @note: we are going a round trip (bell is tested twice)
-        // to make sure the test before it is also working correctly
-        $this->assertEquals(
-            $a->bell()->backspace()->cr()->lf()->tab()->bell()->get(),
-            C0::BELL.C0::BS.C0::CR.C0::LF.C0::TAB.C0::BEL
-        );
-    }
-}
-
-// EOF
+<?php
+
+use \Bramus\Ansi\Ansi;
+use \Bramus\Ansi\Writers\BufferWriter;
+use \Bramus\Ansi\ControlFunctions\Enums\C0;
+
+/**
+ * Test the Control Functions
+ */
+class ControlFunctionsTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testUsingGet()
+    {
+        // Base
+        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Base(C0::BS))->get(), C0::BS);
+
+        // Helper Classes
+        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Backspace())->get(), C0::BS);
+        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Backspace())->get(), C0::BACKSPACE);
+        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Bell())->get(), C0::BEL);
+        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Bell())->get(), C0::BELL);
+        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\CarriageReturn())->get(), C0::CR);
+        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Escape())->get(), C0::ESC);
+        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\LineFeed())->get(), C0::LF);
+        $this->assertEquals((new \Bramus\Ansi\ControlFunctions\Tab())->get(), C0::TAB);
+    }
+
+    public function testUsingToString()
+    {
+        // Base
+        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Base(C0::BS), C0::BS);
+
+        // Helper Classes
+        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Backspace(), C0::BS);
+        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Backspace(), C0::BACKSPACE);
+        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Bell(), C0::BEL);
+        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Bell(), C0::BELL);
+        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\CarriageReturn(), C0::CR);
+        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Escape(), C0::ESC);
+        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\LineFeed(), C0::LF);
+        $this->assertEquals(new \Bramus\Ansi\ControlFunctions\Tab(), C0::TAB);
+    }
+
+    public function testAnsiShorthands()
+    {
+        $a = new Ansi(new BufferWriter());
+
+        $this->assertEquals($a->backspace()->flush(), C0::BS);
+        $this->assertEquals($a->backspace()->flush(), C0::BACKSPACE);
+        $this->assertEquals($a->bell()->flush(), C0::BEL);
+        $this->assertEquals($a->bell()->flush(), C0::BELL);
+        $this->assertEquals($a->cr()->flush(), C0::CR);
+        $this->assertEquals($a->lf()->flush(), C0::LF);
+        $this->assertEquals($a->tab()->flush(), C0::TAB);
+    }
+
+    public function testAnsiShorthandsChaining()
+    {
+        $a = new Ansi(new BufferWriter());
+
+        // @note: we are going a round trip (bell is tested twice)
+        // to make sure the test before it is also working correctly
+        $this->assertEquals(
+            $a->bell()->backspace()->cr()->lf()->tab()->bell()->get(),
+            C0::BELL.C0::BS.C0::CR.C0::LF.C0::TAB.C0::BEL
+        );
+    }
+}
+
+// EOF

+ 102 - 0
vendor/bramus/ansi-php/tests/EscapeSequenceCUBTest.php

@@ -0,0 +1,102 @@
+<?php
+
+use \Bramus\Ansi\Ansi;
+use \Bramus\Ansi\Writers\StreamWriter;
+use \Bramus\Ansi\ControlFunctions\Enums\C0;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\CUB as EscapeSequenceCUB;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
+
+class EscapeSequenceCUBTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testInstantiation()
+    {
+        $es = new EscapeSequenceCUB();
+
+        $this->assertInstanceOf('\Bramus\Ansi\ControlSequences\EscapeSequences\CUB', $es);
+
+        // Final byte must be CUB
+        $this->assertEquals(
+            $es->getFinalByte(),
+            FinalByte::CUB
+        );
+
+        // Parameter Byte must be the default 1
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            1
+        );
+    }
+
+    public function testInstantiationWithNonDefaultParameterByte()
+    {
+        $es = new EscapeSequenceCUB(5);
+
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            5
+        );
+    }
+
+    public function testCUBRaw()
+    {
+        $this->assertEquals(
+            new EscapeSequenceCUB(1),
+            C0::ESC.'['.'1'.FinalByte::CUB
+        );
+    }
+
+    public function testAnsiCUBShorthandsSingle()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->cursorBack()->get(),
+            new EscapeSequenceCUB()
+        );
+    }
+
+    public function testAnsiCUBShorthandChained()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+        $es = new EscapeSequenceCUB();
+
+        $this->assertEquals(
+            $a->cursorBack()->text('test')->get(),
+            $es.'test'
+        );
+    }
+
+    public function testAnsiCUBShorthandsChained()
+    {
+
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->cursorBack()->text('test')->cursorBack()->get(),
+            (new EscapeSequenceCUB()).'test'.(new EscapeSequenceCUB())
+        );
+    }
+
+    public function testAnsiCUBPractical()
+    {
+        ob_start();
+
+        $numChars = 2;
+
+        $a = new Ansi(new StreamWriter('php://output'));
+        $a->text('test')->cursorBack($numChars)->text('overwritten');
+
+        $output = ob_get_contents();
+        
+        // Split on the escape sequence, and manually trim the first part (because we move back)
+        $output = explode(C0::ESC.'['.$numChars.FinalByte::CUB, $output);
+        $output[0] = substr($output[0], 0, -$numChars);
+
+        $this->assertEquals('teoverwritten', implode('', $output));
+
+        ob_end_clean();
+    }
+}
+
+// EOF

+ 82 - 0
vendor/bramus/ansi-php/tests/EscapeSequenceCUDTest.php

@@ -0,0 +1,82 @@
+<?php
+
+use \Bramus\Ansi\Ansi;
+use \Bramus\Ansi\Writers\StreamWriter;
+use \Bramus\Ansi\ControlFunctions\Enums\C0;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\CUD as EscapeSequenceCUD;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
+
+class EscapeSequenceCUDTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testInstantiation()
+    {
+        $es = new EscapeSequenceCUD();
+
+        $this->assertInstanceOf('\Bramus\Ansi\ControlSequences\EscapeSequences\CUD', $es);
+
+        // Final byte must be CUD
+        $this->assertEquals(
+            $es->getFinalByte(),
+            FinalByte::CUD
+        );
+
+        // Parameter Byte must be the default 1
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            1
+        );
+    }
+
+    public function testInstantiationWithNonDefaultParameterByte()
+    {
+        $es = new EscapeSequenceCUD(5);
+
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            5
+        );
+    }
+
+    public function testCUDRaw()
+    {
+        $this->assertEquals(
+            new EscapeSequenceCUD(1),
+            C0::ESC.'['.'1'.FinalByte::CUD
+        );
+    }
+
+    public function testAnsiCUDShorthandsSingle()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->cursorDown()->get(),
+            new EscapeSequenceCUD()
+        );
+    }
+
+    public function testAnsiCUDShorthandChained()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+        $es = new EscapeSequenceCUD();
+
+        $this->assertEquals(
+            $a->cursorDown()->text('test')->get(),
+            $es.'test'
+        );
+    }
+
+    public function testAnsiCUDShorthandsChained()
+    {
+
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->cursorDown()->text('test')->cursorDown()->get(),
+            (new EscapeSequenceCUD()).'test'.(new EscapeSequenceCUD())
+        );
+    }
+}
+
+// EOF

+ 82 - 0
vendor/bramus/ansi-php/tests/EscapeSequenceCUFTest.php

@@ -0,0 +1,82 @@
+<?php
+
+use \Bramus\Ansi\Ansi;
+use \Bramus\Ansi\Writers\StreamWriter;
+use \Bramus\Ansi\ControlFunctions\Enums\C0;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\CUF as EscapeSequenceCUF;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
+
+class EscapeSequenceCUFTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testInstantiation()
+    {
+        $es = new EscapeSequenceCUF();
+
+        $this->assertInstanceOf('\Bramus\Ansi\ControlSequences\EscapeSequences\CUF', $es);
+
+        // Final byte must be CUF
+        $this->assertEquals(
+            $es->getFinalByte(),
+            FinalByte::CUF
+        );
+
+        // Parameter Byte must be the default 1
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            1
+        );
+    }
+
+    public function testInstantiationWithNonDefaultParameterByte()
+    {
+        $es = new EscapeSequenceCUF(5);
+
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            5
+        );
+    }
+
+    public function testCUFRaw()
+    {
+        $this->assertEquals(
+            new EscapeSequenceCUF(1),
+            C0::ESC.'['.'1'.FinalByte::CUF
+        );
+    }
+
+    public function testAnsiCUFShorthandsSingle()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->cursorForward()->get(),
+            new EscapeSequenceCUF()
+        );
+    }
+
+    public function testAnsiCUFShorthandChained()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+        $es = new EscapeSequenceCUF();
+
+        $this->assertEquals(
+            $a->cursorForward()->text('test')->get(),
+            $es.'test'
+        );
+    }
+
+    public function testAnsiCUFShorthandsChained()
+    {
+
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->cursorForward()->text('test')->cursorForward()->get(),
+            (new EscapeSequenceCUF()).'test'.(new EscapeSequenceCUF())
+        );
+    }
+}
+
+// EOF

+ 82 - 0
vendor/bramus/ansi-php/tests/EscapeSequenceCUPTest.php

@@ -0,0 +1,82 @@
+<?php
+
+use \Bramus\Ansi\Ansi;
+use \Bramus\Ansi\Writers\StreamWriter;
+use \Bramus\Ansi\ControlFunctions\Enums\C0;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\CUP as EscapeSequenceCUP;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
+
+class EscapeSequenceCUPTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testInstantiation()
+    {
+        $es = new EscapeSequenceCUP();
+
+        $this->assertInstanceOf('\Bramus\Ansi\ControlSequences\EscapeSequences\CUP', $es);
+
+        // Final byte must be CUP
+        $this->assertEquals(
+            $es->getFinalByte(),
+            FinalByte::CUP
+        );
+
+        // Parameter Byte must be the default 1, 1
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            '1;1'
+        );
+    }
+
+    public function testInstantiationWithNonDefaultParameterByte()
+    {
+        $es = new EscapeSequenceCUP('5;6');
+
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            '5;6'
+        );
+    }
+
+    public function testCUPRaw()
+    {
+        $this->assertEquals(
+            new EscapeSequenceCUP('1;1'),
+            C0::ESC.'['.'1;1'.FinalByte::CUP
+        );
+    }
+
+    public function testAnsiCUPShorthandsSingle()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->cursorPosition()->get(),
+            new EscapeSequenceCUP()
+        );
+    }
+
+    public function testAnsiCUPShorthandChained()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+        $es = new EscapeSequenceCUP();
+
+        $this->assertEquals(
+            $a->cursorPosition()->text('test')->get(),
+            $es.'test'
+        );
+    }
+
+    public function testAnsiCUPShorthandsChained()
+    {
+
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->cursorPosition()->text('test')->cursorPosition()->get(),
+            (new EscapeSequenceCUP()).'test'.(new EscapeSequenceCUP())
+        );
+    }
+}
+
+// EOF

+ 82 - 0
vendor/bramus/ansi-php/tests/EscapeSequenceCUUTest.php

@@ -0,0 +1,82 @@
+<?php
+
+use \Bramus\Ansi\Ansi;
+use \Bramus\Ansi\Writers\StreamWriter;
+use \Bramus\Ansi\ControlFunctions\Enums\C0;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\CUU as EscapeSequenceCUU;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
+
+class EscapeSequenceCUUTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testInstantiation()
+    {
+        $es = new EscapeSequenceCUU();
+
+        $this->assertInstanceOf('\Bramus\Ansi\ControlSequences\EscapeSequences\CUU', $es);
+
+        // Final byte must be CUU
+        $this->assertEquals(
+            $es->getFinalByte(),
+            FinalByte::CUU
+        );
+
+        // Parameter Byte must be the default 1
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            1
+        );
+    }
+
+    public function testInstantiationWithNonDefaultParameterByte()
+    {
+        $es = new EscapeSequenceCUU(5);
+
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            5
+        );
+    }
+
+    public function testCUURaw()
+    {
+        $this->assertEquals(
+            new EscapeSequenceCUU(1),
+            C0::ESC.'['.'1'.FinalByte::CUU
+        );
+    }
+
+    public function testAnsiCUUShorthandsSingle()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->cursorUp()->get(),
+            new EscapeSequenceCUU()
+        );
+    }
+
+    public function testAnsiCUUShorthandChained()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+        $es = new EscapeSequenceCUU();
+
+        $this->assertEquals(
+            $a->cursorUp()->text('test')->get(),
+            $es.'test'
+        );
+    }
+
+    public function testAnsiCUUShorthandsChained()
+    {
+
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->cursorUp()->text('test')->cursorUp()->get(),
+            (new EscapeSequenceCUU()).'test'.(new EscapeSequenceCUU())
+        );
+    }
+}
+
+// EOF

+ 96 - 96
vendor/bramus/ansi-php/tests/EscapeSequenceEDTest.php

@@ -1,96 +1,96 @@
-<?php
-
-use \Bramus\Ansi\Ansi;
-use \Bramus\Ansi\Writers\StreamWriter;
-use \Bramus\Ansi\ControlFunctions\Enums\C0;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\ED as EscapeSequenceED;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\ED;
-
-class EscapeSequenceEDTest extends PHPUnit_Framework_TestCase
-{
-
-    public function testInstantiation()
-    {
-        $es = new EscapeSequenceED(ED::ALL);
-
-        $this->assertInstanceOf('\Bramus\Ansi\ControlSequences\EscapeSequences\ED', $es);
-
-        // Final byte must be ED
-        $this->assertEquals(
-            $es->getFinalByte(),
-            FinalByte::ED
-        );
-
-        // Parameter Byte must be ED::ALL
-        $this->assertEquals(
-            $es->getParameterBytes(),
-            ED::ALL
-        );
-    }
-
-    public function testEDRaw()
-    {
-        // ED::ALL
-        $this->assertEquals(
-            new EscapeSequenceED(ED::ALL),
-            C0::ESC.'['.ED::ALL.FinalByte::ED
-        );
-
-        // ED::UP
-        $this->assertEquals(
-            new EscapeSequenceED(ED::UP),
-            C0::ESC.'['.ED::UP.FinalByte::ED
-        );
-
-        // ED::DOWN
-        $this->assertEquals(
-            new EscapeSequenceED(ED::DOWN),
-            C0::ESC.'['.ED::DOWN.FinalByte::ED
-        );
-    }
-
-    public function testAnsiEDShorthandsSingle()
-    {
-        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
-
-        $this->assertEquals(
-            $a->eraseDisplayUp()->get(),
-            new EscapeSequenceED(ED::UP)
-        );
-
-        $this->assertEquals(
-            $a->eraseDisplayDown()->get(),
-            new EscapeSequenceED(ED::DOWN)
-        );
-
-        $this->assertEquals(
-            $a->eraseDisplay()->get(),
-            new EscapeSequenceED(ED::ALL)
-        );
-    }
-
-    public function testAnsiEDShorthandChained()
-    {
-        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
-        $es = new EscapeSequenceED(ED::ALL);
-
-        $this->assertEquals(
-            $a->ed(ED::ALL)->text('test')->get(),
-            $es.'test'
-        );
-    }
-
-    public function testAnsiEDShorthandsChained()
-    {
-
-        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
-
-        $this->assertEquals(
-            $a->eraseDisplayUp()->eraseDisplayDown()->eraseDisplay()->text('test')->get(),
-            (new EscapeSequenceED(ED::UP)).(new EscapeSequenceED(ED::DOWN)).(new EscapeSequenceED(ED::ALL)).'test'
-        );
-    }
-}
-
-// EOF
+<?php
+
+use \Bramus\Ansi\Ansi;
+use \Bramus\Ansi\Writers\StreamWriter;
+use \Bramus\Ansi\ControlFunctions\Enums\C0;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\ED as EscapeSequenceED;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\ED;
+
+class EscapeSequenceEDTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testInstantiation()
+    {
+        $es = new EscapeSequenceED(ED::ALL);
+
+        $this->assertInstanceOf('\Bramus\Ansi\ControlSequences\EscapeSequences\ED', $es);
+
+        // Final byte must be ED
+        $this->assertEquals(
+            $es->getFinalByte(),
+            FinalByte::ED
+        );
+
+        // Parameter Byte must be ED::ALL
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            ED::ALL
+        );
+    }
+
+    public function testEDRaw()
+    {
+        // ED::ALL
+        $this->assertEquals(
+            new EscapeSequenceED(ED::ALL),
+            C0::ESC.'['.ED::ALL.FinalByte::ED
+        );
+
+        // ED::UP
+        $this->assertEquals(
+            new EscapeSequenceED(ED::UP),
+            C0::ESC.'['.ED::UP.FinalByte::ED
+        );
+
+        // ED::DOWN
+        $this->assertEquals(
+            new EscapeSequenceED(ED::DOWN),
+            C0::ESC.'['.ED::DOWN.FinalByte::ED
+        );
+    }
+
+    public function testAnsiEDShorthandsSingle()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->eraseDisplayUp()->get(),
+            new EscapeSequenceED(ED::UP)
+        );
+
+        $this->assertEquals(
+            $a->eraseDisplayDown()->get(),
+            new EscapeSequenceED(ED::DOWN)
+        );
+
+        $this->assertEquals(
+            $a->eraseDisplay()->get(),
+            new EscapeSequenceED(ED::ALL)
+        );
+    }
+
+    public function testAnsiEDShorthandChained()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+        $es = new EscapeSequenceED(ED::ALL);
+
+        $this->assertEquals(
+            $a->ed(ED::ALL)->text('test')->get(),
+            $es.'test'
+        );
+    }
+
+    public function testAnsiEDShorthandsChained()
+    {
+
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->eraseDisplayUp()->eraseDisplayDown()->eraseDisplay()->text('test')->get(),
+            (new EscapeSequenceED(ED::UP)).(new EscapeSequenceED(ED::DOWN)).(new EscapeSequenceED(ED::ALL)).'test'
+        );
+    }
+}
+
+// EOF

+ 96 - 96
vendor/bramus/ansi-php/tests/EscapeSequenceELTest.php

@@ -1,96 +1,96 @@
-<?php
-
-use \Bramus\Ansi\Ansi;
-use \Bramus\Ansi\Writers\StreamWriter;
-use \Bramus\Ansi\ControlFunctions\Enums\C0;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\EL as EscapeSequenceEL;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\EL;
-
-class EscapeSequenceELTest extends PHPUnit_Framework_TestCase
-{
-
-    public function testInstantiation()
-    {
-        $es = new EscapeSequenceEL(EL::ALL);
-
-        $this->assertInstanceOf('\Bramus\Ansi\ControlSequences\EscapeSequences\EL', $es);
-
-        // Final byte must be EL
-        $this->assertEquals(
-            $es->getFinalByte(),
-            FinalByte::EL
-        );
-
-        // Parameter Byte must be EL::ALL
-        $this->assertEquals(
-            $es->getParameterBytes(),
-            EL::ALL
-        );
-    }
-
-    public function testELRaw()
-    {
-        // EL::ALL
-        $this->assertEquals(
-            new EscapeSequenceEL(EL::ALL),
-            C0::ESC.'['.EL::ALL.FinalByte::EL
-        );
-
-        // EL::TO_EOL
-        $this->assertEquals(
-            new EscapeSequenceEL(EL::TO_EOL),
-            C0::ESC.'['.EL::TO_EOL.FinalByte::EL
-        );
-
-        // EL::TO_SOL
-        $this->assertEquals(
-            new EscapeSequenceEL(EL::TO_SOL),
-            C0::ESC.'['.EL::TO_SOL.FinalByte::EL
-        );
-    }
-
-    public function testAnsiELShorthandsSingle()
-    {
-        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
-
-        $this->assertEquals(
-            $a->eraseLine()->get(),
-            new EscapeSequenceEL(EL::ALL)
-        );
-
-        $this->assertEquals(
-            $a->eraseLineToEol()->get(),
-            new EscapeSequenceEL(EL::TO_EOL)
-        );
-
-        $this->assertEquals(
-            $a->eraseLineToSol()->get(),
-            new EscapeSequenceEL(EL::TO_SOL)
-        );
-    }
-
-    public function testAnsiELShorthandChained()
-    {
-        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
-        $es = new EscapeSequenceEL(EL::ALL);
-
-        $this->assertEquals(
-            $a->el(EL::ALL)->text('test')->get(),
-            $es.'test'
-        );
-    }
-
-    public function testAnsiELShorthandsChained()
-    {
-
-        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
-
-        $this->assertEquals(
-            $a->eraseLine()->eraseLineToEol()->eraseLineToSol()->text('test')->get(),
-            (new EscapeSequenceEL(EL::ALL)).(new EscapeSequenceEL(EL::TO_EOL)).(new EscapeSequenceEL(EL::TO_SOL)).'test'
-        );
-    }
-}
-
-// EOF
+<?php
+
+use \Bramus\Ansi\Ansi;
+use \Bramus\Ansi\Writers\StreamWriter;
+use \Bramus\Ansi\ControlFunctions\Enums\C0;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\EL as EscapeSequenceEL;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\EL;
+
+class EscapeSequenceELTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testInstantiation()
+    {
+        $es = new EscapeSequenceEL(EL::ALL);
+
+        $this->assertInstanceOf('\Bramus\Ansi\ControlSequences\EscapeSequences\EL', $es);
+
+        // Final byte must be EL
+        $this->assertEquals(
+            $es->getFinalByte(),
+            FinalByte::EL
+        );
+
+        // Parameter Byte must be EL::ALL
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            EL::ALL
+        );
+    }
+
+    public function testELRaw()
+    {
+        // EL::ALL
+        $this->assertEquals(
+            new EscapeSequenceEL(EL::ALL),
+            C0::ESC.'['.EL::ALL.FinalByte::EL
+        );
+
+        // EL::TO_EOL
+        $this->assertEquals(
+            new EscapeSequenceEL(EL::TO_EOL),
+            C0::ESC.'['.EL::TO_EOL.FinalByte::EL
+        );
+
+        // EL::TO_SOL
+        $this->assertEquals(
+            new EscapeSequenceEL(EL::TO_SOL),
+            C0::ESC.'['.EL::TO_SOL.FinalByte::EL
+        );
+    }
+
+    public function testAnsiELShorthandsSingle()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->eraseLine()->get(),
+            new EscapeSequenceEL(EL::ALL)
+        );
+
+        $this->assertEquals(
+            $a->eraseLineToEol()->get(),
+            new EscapeSequenceEL(EL::TO_EOL)
+        );
+
+        $this->assertEquals(
+            $a->eraseLineToSol()->get(),
+            new EscapeSequenceEL(EL::TO_SOL)
+        );
+    }
+
+    public function testAnsiELShorthandChained()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+        $es = new EscapeSequenceEL(EL::ALL);
+
+        $this->assertEquals(
+            $a->el(EL::ALL)->text('test')->get(),
+            $es.'test'
+        );
+    }
+
+    public function testAnsiELShorthandsChained()
+    {
+
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->eraseLine()->eraseLineToEol()->eraseLineToSol()->text('test')->get(),
+            (new EscapeSequenceEL(EL::ALL)).(new EscapeSequenceEL(EL::TO_EOL)).(new EscapeSequenceEL(EL::TO_SOL)).'test'
+        );
+    }
+}
+
+// EOF

+ 85 - 85
vendor/bramus/ansi-php/tests/EscapeSequenceSGRTest.php

@@ -1,85 +1,85 @@
-<?php
-
-use \Bramus\Ansi\Ansi;
-use \Bramus\Ansi\Writers\StreamWriter;
-use \Bramus\Ansi\ControlFunctions\Enums\C0;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\SGR as EscapeSequenceSGR;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR;
-
-class EscapeSequenceSGRTest extends PHPUnit_Framework_TestCase
-{
-
-    public function testInstantiation()
-    {
-        $es = new EscapeSequenceSGR();
-
-        $this->assertInstanceOf('\Bramus\Ansi\ControlSequences\EscapeSequences\SGR', $es);
-
-        // Final byte must be SGR
-        $this->assertEquals(
-            $es->getFinalByte(),
-            FinalByte::SGR
-        );
-
-        // Parameter Byte must be SGR::STYLE_NONE
-        $this->assertEquals(
-            $es->getParameterBytes(),
-            SGR::STYLE_NONE
-        );
-    }
-
-    public function testSgrRaw()
-    {
-        // One Parameter
-        $this->assertEquals(
-            new EscapeSequenceSGR(SGR::STYLE_NONE),
-            C0::ESC.'['.SGR::STYLE_NONE.FinalByte::SGR
-        );
-
-        // Multiple Parameters
-        $this->assertEquals(
-            new EscapeSequenceSGR(array(SGR::STYLE_NONE, SGR::STYLE_BOLD)),
-            C0::ESC.'['.SGR::STYLE_NONE.';'.SGR::STYLE_BOLD.FinalByte::SGR
-        );
-    }
-
-    public function testAnsiSgrShorthandsSingle()
-    {
-        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
-
-        $this->assertEquals(
-            $a->sgr(SGR::COLOR_FG_RED)->get(),
-            new EscapeSequenceSGR(SGR::COLOR_FG_RED)
-        );
-
-        $this->assertEquals(
-            $a->sgr()->get(),
-            new EscapeSequenceSGR(SGR::STYLE_NONE)
-        );
-    }
-
-    public function testAnsiSgrShorthandChained()
-    {
-
-        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
-
-        $this->assertEquals(
-            $a->sgr(SGR::COLOR_FG_RED)->text('test')->get(),
-            (new EscapeSequenceSGR(SGR::COLOR_FG_RED)).'test'
-        );
-    }
-
-    public function testAnsiSgrShorthandsChained()
-    {
-
-        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
-
-        $this->assertEquals(
-            $a->bold()->underline()->color(SGR::COLOR_FG_RED)->underline()->blink()->text('test')->reset()->get(),
-            (new EscapeSequenceSGR(SGR::STYLE_BOLD)).(new EscapeSequenceSGR(SGR::STYLE_UNDERLINE)).(new EscapeSequenceSGR(SGR::COLOR_FG_RED)).(new EscapeSequenceSGR(SGR::STYLE_UNDERLINE)).(new EscapeSequenceSGR(SGR::STYLE_BLINK)).'test'.(new EscapeSequenceSGR(SGR::STYLE_NONE))
-        );
-    }
-}
-
-// EOF
+<?php
+
+use \Bramus\Ansi\Ansi;
+use \Bramus\Ansi\Writers\StreamWriter;
+use \Bramus\Ansi\ControlFunctions\Enums\C0;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\SGR as EscapeSequenceSGR;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR;
+
+class EscapeSequenceSGRTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testInstantiation()
+    {
+        $es = new EscapeSequenceSGR();
+
+        $this->assertInstanceOf('\Bramus\Ansi\ControlSequences\EscapeSequences\SGR', $es);
+
+        // Final byte must be SGR
+        $this->assertEquals(
+            $es->getFinalByte(),
+            FinalByte::SGR
+        );
+
+        // Parameter Byte must be SGR::STYLE_NONE
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            SGR::STYLE_NONE
+        );
+    }
+
+    public function testSgrRaw()
+    {
+        // One Parameter
+        $this->assertEquals(
+            new EscapeSequenceSGR(SGR::STYLE_NONE),
+            C0::ESC.'['.SGR::STYLE_NONE.FinalByte::SGR
+        );
+
+        // Multiple Parameters
+        $this->assertEquals(
+            new EscapeSequenceSGR(array(SGR::STYLE_NONE, SGR::STYLE_BOLD)),
+            C0::ESC.'['.SGR::STYLE_NONE.';'.SGR::STYLE_BOLD.FinalByte::SGR
+        );
+    }
+
+    public function testAnsiSgrShorthandsSingle()
+    {
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->sgr(SGR::COLOR_FG_RED)->get(),
+            new EscapeSequenceSGR(SGR::COLOR_FG_RED)
+        );
+
+        $this->assertEquals(
+            $a->sgr()->get(),
+            new EscapeSequenceSGR(SGR::STYLE_NONE)
+        );
+    }
+
+    public function testAnsiSgrShorthandChained()
+    {
+
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->sgr(SGR::COLOR_FG_RED)->text('test')->get(),
+            (new EscapeSequenceSGR(SGR::COLOR_FG_RED)).'test'
+        );
+    }
+
+    public function testAnsiSgrShorthandsChained()
+    {
+
+        $a = new Ansi(new \Bramus\Ansi\Writers\BufferWriter());
+
+        $this->assertEquals(
+            $a->bold()->underline()->color(SGR::COLOR_FG_RED)->underline()->blink()->text('test')->reset()->get(),
+            (new EscapeSequenceSGR(SGR::STYLE_BOLD)).(new EscapeSequenceSGR(SGR::STYLE_UNDERLINE)).(new EscapeSequenceSGR(SGR::COLOR_FG_RED)).(new EscapeSequenceSGR(SGR::STYLE_UNDERLINE)).(new EscapeSequenceSGR(SGR::STYLE_BLINK)).'test'.(new EscapeSequenceSGR(SGR::STYLE_NONE))
+        );
+    }
+}
+
+// EOF

+ 50 - 50
vendor/bramus/ansi-php/tests/EscapeSequenceTest.php

@@ -1,50 +1,50 @@
-<?php
-
-use \Bramus\Ansi\Ansi;
-use \Bramus\Ansi\Writers\StreamWriter;
-use \Bramus\Ansi\ControlFunctions\Enums\C0;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\Base as EscapeSequence;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
-
-class EscapeSequenceTest extends PHPUnit_Framework_TestCase
-{
-
-    public function testInstantiation()
-    {
-        $es = new EscapeSequence(FinalByte::ED);
-
-        $this->assertInstanceOf('\Bramus\Ansi\ControlSequences\EscapeSequences\Base', $es);
-
-        // EscapeSequences MUST start with an Escape Control Function
-        $this->assertInstanceOf('\Bramus\Ansi\ControlFunctions\Escape', $es->getControlSequenceIntroducer());
-
-        // The finalByte passed in was ED
-        $this->assertEquals(
-            $es->getFinalByte(),
-            FinalByte::ED
-        );
-    }
-
-    public function testFinalByte()
-    {
-        $es = new EscapeSequence(FinalByte::ED);
-
-        // Set new final byte
-        $es->setFinalByte(FinalByte::EL);
-
-        // Check for new Final Byte
-        $this->assertEquals(
-            $es->getFinalByte(),
-            FinalByte::EL
-        );
-
-        $this->assertEquals(
-            $es->get(),
-            C0::ESC . '[' . FinalByte::EL
-        );
-
-    }
-
-}
-
-// EOF
+<?php
+
+use \Bramus\Ansi\Ansi;
+use \Bramus\Ansi\Writers\StreamWriter;
+use \Bramus\Ansi\ControlFunctions\Enums\C0;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Base as EscapeSequence;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
+
+class EscapeSequenceTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testInstantiation()
+    {
+        $es = new EscapeSequence(FinalByte::ED);
+
+        $this->assertInstanceOf('\Bramus\Ansi\ControlSequences\EscapeSequences\Base', $es);
+
+        // EscapeSequences MUST start with an Escape Control Function
+        $this->assertInstanceOf('\Bramus\Ansi\ControlFunctions\Escape', $es->getControlSequenceIntroducer());
+
+        // The finalByte passed in was ED
+        $this->assertEquals(
+            $es->getFinalByte(),
+            FinalByte::ED
+        );
+    }
+
+    public function testFinalByte()
+    {
+        $es = new EscapeSequence(FinalByte::ED);
+
+        // Set new final byte
+        $es->setFinalByte(FinalByte::EL);
+
+        // Check for new Final Byte
+        $this->assertEquals(
+            $es->getFinalByte(),
+            FinalByte::EL
+        );
+
+        $this->assertEquals(
+            $es->get(),
+            C0::ESC . '[' . FinalByte::EL
+        );
+
+    }
+
+}
+
+// EOF

+ 60 - 60
vendor/bramus/ansi-php/tests/EscapeSequenceWithParameterBytesTest.php

@@ -1,60 +1,60 @@
-<?php
-
-use \Bramus\Ansi\ControlFunctions\Enums\C0;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\SGR as EscapeSequenceSGR;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
-use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR;
-
-class EscapeSequenceWithParameterBytesTest extends PHPUnit_Framework_TestCase
-{
-    public function testParameterBytesSingle()
-    {
-        $es = new EscapeSequenceSGR(0);
-
-        $this->assertEquals(
-            $es->getParameterBytes(),
-            0
-        );
-
-        $this->assertEquals(
-            $es->get(),
-            C0::ESC . '[' . 0 . FinalByte::SGR
-        );
-    }
-
-    public function testParameterBytesSingleAdd()
-    {
-        $es = new EscapeSequenceSGR(0);
-
-        // Add a parameter byte
-        $es->addParameterByte(1);
-
-        $this->assertEquals(
-            $es->getParameterBytes(),
-            '01'
-        );
-
-        $this->assertEquals(
-            $es->get(),
-            C0::ESC . '[' . '0;1' . FinalByte::SGR
-        );
-
-    }
-
-    public function testParameterBytesArray()
-    {
-        $es = new EscapeSequenceSGR(array(0, 1));
-
-        // Check for new Final Byte
-        $this->assertEquals(
-            $es->getParameterBytes(),
-            '01'
-        );
-
-        $this->assertEquals(
-            $es->get(),
-            C0::ESC . '[' . '0;1' . FinalByte::SGR
-        );
-
-    }
-}
+<?php
+
+use \Bramus\Ansi\ControlFunctions\Enums\C0;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\SGR as EscapeSequenceSGR;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\FinalByte;
+use \Bramus\Ansi\ControlSequences\EscapeSequences\Enums\SGR;
+
+class EscapeSequenceWithParameterBytesTest extends PHPUnit_Framework_TestCase
+{
+    public function testParameterBytesSingle()
+    {
+        $es = new EscapeSequenceSGR(0);
+
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            0
+        );
+
+        $this->assertEquals(
+            $es->get(),
+            C0::ESC . '[' . 0 . FinalByte::SGR
+        );
+    }
+
+    public function testParameterBytesSingleAdd()
+    {
+        $es = new EscapeSequenceSGR(0);
+
+        // Add a parameter byte
+        $es->addParameterByte(1);
+
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            '01'
+        );
+
+        $this->assertEquals(
+            $es->get(),
+            C0::ESC . '[' . '0;1' . FinalByte::SGR
+        );
+
+    }
+
+    public function testParameterBytesArray()
+    {
+        $es = new EscapeSequenceSGR(array(0, 1));
+
+        // Check for new Final Byte
+        $this->assertEquals(
+            $es->getParameterBytes(),
+            '01'
+        );
+
+        $this->assertEquals(
+            $es->get(),
+            C0::ESC . '[' . '0;1' . FinalByte::SGR
+        );
+
+    }
+}

+ 71 - 71
vendor/bramus/ansi-php/tests/WritersTest.php

@@ -1,72 +1,72 @@
-<?php
-
-use \Bramus\Ansi\Writers\StreamWriter;
-use \Bramus\Ansi\Writers\BufferWriter;
-use \Bramus\Ansi\Writers\ProxyWriter;
-
-class WritersTest extends PHPUnit_Framework_TestCase
-{
-    public function testStreamWriter()
-    {
-
-        // Start object buffering to catch any output
-        ob_start();
-
-        // Create a StreamWriter
-        // @note: Using php://output instead of php://stdout — https://bugs.php.net/bug.php?id=49688
-        $w = new StreamWriter('php://output');
-
-        // Write something to the writer
-        $w->write('test');
-
-        // The written data should be echo'd (StreamWriter)
-        $this->assertEquals('test', ob_get_contents());
-
-        // Cleanup
-        ob_end_clean();
-
-    }
-
-    public function testBufferWriter()
-    {
-
-        // Create a BufferWriter
-        $w = new BufferWriter();
-
-        // Write something to the Proxy
-        $w->write('test');
-
-        // Flush its contents
-        $res = $w->flush();
-
-        // The written data should be returned
-        $this->assertEquals('test', $res);
-
-    }
-
-    public function testProxyWriter()
-    {
-
-        // Start object buffering to catch any output
-        ob_start();
-
-        // Create a ProxyWriter which proxies for a StreamWriter
-        $w = new ProxyWriter(new StreamWriter('php://output'));
-
-        // Write something to the Proxy
-        $w->write('test');
-
-        // Flush its contents
-        $res = $w->flush();
-
-        // The written data should be echo'd (StreamWriter)
-        $this->assertEquals('test', ob_get_contents());
-
-        // The written data should be returned too (ProxyWriter)
-        $this->assertEquals('test', $res);
-
-        // Cleanup
-        ob_end_clean();
-
-    }
+<?php
+
+use \Bramus\Ansi\Writers\StreamWriter;
+use \Bramus\Ansi\Writers\BufferWriter;
+use \Bramus\Ansi\Writers\ProxyWriter;
+
+class WritersTest extends PHPUnit_Framework_TestCase
+{
+    public function testStreamWriter()
+    {
+
+        // Start object buffering to catch any output
+        ob_start();
+
+        // Create a StreamWriter
+        // @note: Using php://output instead of php://stdout — https://bugs.php.net/bug.php?id=49688
+        $w = new StreamWriter('php://output');
+
+        // Write something to the writer
+        $w->write('test');
+
+        // The written data should be echo'd (StreamWriter)
+        $this->assertEquals('test', ob_get_contents());
+
+        // Cleanup
+        ob_end_clean();
+
+    }
+
+    public function testBufferWriter()
+    {
+
+        // Create a BufferWriter
+        $w = new BufferWriter();
+
+        // Write something to the Proxy
+        $w->write('test');
+
+        // Flush its contents
+        $res = $w->flush();
+
+        // The written data should be returned
+        $this->assertEquals('test', $res);
+
+    }
+
+    public function testProxyWriter()
+    {
+
+        // Start object buffering to catch any output
+        ob_start();
+
+        // Create a ProxyWriter which proxies for a StreamWriter
+        $w = new ProxyWriter(new StreamWriter('php://output'));
+
+        // Write something to the Proxy
+        $w->write('test');
+
+        // Flush its contents
+        $res = $w->flush();
+
+        // The written data should be echo'd (StreamWriter)
+        $this->assertEquals('test', ob_get_contents());
+
+        // The written data should be returned too (ProxyWriter)
+        $this->assertEquals('test', $res);
+
+        // Cleanup
+        ob_end_clean();
+
+    }
 }

+ 10 - 10
vendor/bramus/ansi-php/tests/bootstrap.php

@@ -1,10 +1,10 @@
-<?php
-
-    // Enable Error Reporting
-    error_reporting(E_ALL);
-    ini_set('display_errors', 'on');
-
-    // Requires
-    require_once __DIR__.'/../vendor/autoload.php';
-
-// EOF
+<?php
+
+    // Enable Error Reporting
+    error_reporting(E_ALL);
+    ini_set('display_errors', 'on');
+
+    // Requires
+    require_once __DIR__.'/../vendor/autoload.php';
+
+// EOF

+ 1 - 1
vendor/composer/autoload_files.php

@@ -8,7 +8,7 @@ $baseDir = dirname($vendorDir);
 return array(
     '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
     'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
-    'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
+    '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
     '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
     '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
     'f5df59ef04e89a509333d52505b5236d' => $baseDir . '/app/helpers.php',

+ 2 - 1
vendor/composer/autoload_psr4.php

@@ -8,7 +8,8 @@ $baseDir = dirname($vendorDir);
 return array(
     'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
     'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
-    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
+    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
+    'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
     'Predis\\' => array($vendorDir . '/predis/predis/src'),
     'PhpOption\\' => array($vendorDir . '/phpoption/phpoption/src/PhpOption'),
     'PHPMailer\\PHPMailer\\' => array($vendorDir . '/phpmailer/phpmailer/src'),

+ 0 - 2
vendor/composer/autoload_real.php

@@ -22,8 +22,6 @@ class ComposerAutoloaderInit99b73a665e0d2066a2cb8dd066883cba
             return self::$loader;
         }
 
-        require __DIR__ . '/platform_check.php';
-
         spl_autoload_register(array('ComposerAutoloaderInit99b73a665e0d2066a2cb8dd066883cba', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
         spl_autoload_unregister(array('ComposerAutoloaderInit99b73a665e0d2066a2cb8dd066883cba', 'loadClassLoader'));

+ 8 - 2
vendor/composer/autoload_static.php

@@ -9,7 +9,7 @@ class ComposerStaticInit99b73a665e0d2066a2cb8dd066883cba
     public static $files = array (
         '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
         'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
-        'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
+        '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
         '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
         'f5df59ef04e89a509333d52505b5236d' => __DIR__ . '/../..' . '/app/helpers.php',
@@ -24,6 +24,7 @@ class ComposerStaticInit99b73a665e0d2066a2cb8dd066883cba
         array (
             'Psr\\Log\\' => 8,
             'Psr\\Http\\Message\\' => 17,
+            'Psr\\Http\\Client\\' => 16,
             'Predis\\' => 7,
             'PhpOption\\' => 10,
             'PHPMailer\\PHPMailer\\' => 20,
@@ -65,7 +66,12 @@ class ComposerStaticInit99b73a665e0d2066a2cb8dd066883cba
         ),
         'Psr\\Http\\Message\\' => 
         array (
-            0 => __DIR__ . '/..' . '/psr/http-message/src',
+            0 => __DIR__ . '/..' . '/psr/http-factory/src',
+            1 => __DIR__ . '/..' . '/psr/http-message/src',
+        ),
+        'Psr\\Http\\Client\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/psr/http-client/src',
         ),
         'Predis\\' => 
         array (

File diff suppressed because it is too large
+ 515 - 104
vendor/composer/installed.json


+ 74 - 35
vendor/composer/installed.php

@@ -5,18 +5,18 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '8360a3f7db50835acb8a1efcd0292437099d01bc',
+        'reference' => 'c5c9564277cff72a50ffd35dacb60c8022c44052',
         'name' => 'luolongfei/freenom',
         'dev' => true,
     ),
     'versions' => array(
         'bramus/ansi-php' => array(
-            'pretty_version' => '3.0.3',
-            'version' => '3.0.3.0',
+            'pretty_version' => '3.1',
+            'version' => '3.1.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../bramus/ansi-php',
             'aliases' => array(),
-            'reference' => 'fb0be33f36053af7454d462e3ddc0a2ac0b2f311',
+            'reference' => 'f581b2fd322177e5fabd67af240811838c1c8fbc',
             'dev_requirement' => false,
         ),
         'bramus/monolog-colored-line-formatter' => array(
@@ -29,30 +29,30 @@
             'dev_requirement' => false,
         ),
         'guzzlehttp/guzzle' => array(
-            'pretty_version' => '6.5.2',
-            'version' => '6.5.2.0',
+            'pretty_version' => '7.4.1',
+            'version' => '7.4.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
             'aliases' => array(),
-            'reference' => '43ece0e75098b7ecd8d13918293029e555a50f82',
+            'reference' => 'ee0a041b1760e6a53d2a39c8c34115adc2af2c79',
             'dev_requirement' => false,
         ),
         'guzzlehttp/promises' => array(
-            'pretty_version' => 'v1.3.1',
-            'version' => '1.3.1.0',
+            'pretty_version' => '1.5.1',
+            'version' => '1.5.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/promises',
             'aliases' => array(),
-            'reference' => 'a59da6cf61d80060647ff4d3eb2c03a2bc694646',
+            'reference' => 'fe752aedc9fd8fcca3fe7ad05d419d32998a06da',
             'dev_requirement' => false,
         ),
         'guzzlehttp/psr7' => array(
-            'pretty_version' => '1.6.1',
-            'version' => '1.6.1.0',
+            'pretty_version' => '2.1.0',
+            'version' => '2.1.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/psr7',
             'aliases' => array(),
-            'reference' => '239400de7a173fe9901b9ac7c06497751f00727a',
+            'reference' => '089edd38f5b8abba6cb01567c2a8aaa47cec4c72',
             'dev_requirement' => false,
         ),
         'kevinlebrun/colors.php' => array(
@@ -70,44 +70,74 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '8360a3f7db50835acb8a1efcd0292437099d01bc',
+            'reference' => 'c5c9564277cff72a50ffd35dacb60c8022c44052',
             'dev_requirement' => false,
         ),
         'monolog/monolog' => array(
-            'pretty_version' => '1.25.3',
-            'version' => '1.25.3.0',
+            'pretty_version' => '1.26.1',
+            'version' => '1.26.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../monolog/monolog',
             'aliases' => array(),
-            'reference' => 'fa82921994db851a8becaf3787a9e73c5976b6f1',
+            'reference' => 'c6b00f05152ae2c9b04a448f99c7590beb6042f5',
             'dev_requirement' => false,
         ),
         'phpmailer/phpmailer' => array(
-            'pretty_version' => 'v6.1.6',
-            'version' => '6.1.6.0',
+            'pretty_version' => 'v6.5.3',
+            'version' => '6.5.3.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpmailer/phpmailer',
             'aliases' => array(),
-            'reference' => 'c2796cb1cb99d7717290b48c4e6f32cb6c60b7b3',
+            'reference' => 'baeb7cde6b60b1286912690ab0693c7789a31e71',
             'dev_requirement' => false,
         ),
         'phpoption/phpoption' => array(
-            'pretty_version' => '1.7.2',
-            'version' => '1.7.2.0',
+            'pretty_version' => '1.8.1',
+            'version' => '1.8.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpoption/phpoption',
             'aliases' => array(),
-            'reference' => '77f7c4d2e65413aff5b5a8cc8b3caf7a28d81959',
+            'reference' => 'eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15',
             'dev_requirement' => false,
         ),
         'predis/predis' => array(
-            'pretty_version' => 'v1.1.1',
-            'version' => '1.1.1.0',
+            'pretty_version' => 'v1.1.10',
+            'version' => '1.1.10.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../predis/predis',
             'aliases' => array(),
-            'reference' => 'f0210e38881631afeafb56ab43405a92cafd9fd1',
+            'reference' => 'a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e',
+            'dev_requirement' => false,
+        ),
+        'psr/http-client' => array(
+            'pretty_version' => '1.0.1',
+            'version' => '1.0.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-client',
+            'aliases' => array(),
+            'reference' => '2dfb5f6c5eff0e91e20e913f8c5452ed95b86621',
+            'dev_requirement' => false,
+        ),
+        'psr/http-client-implementation' => array(
+            'dev_requirement' => false,
+            'provided' => array(
+                0 => '1.0',
+            ),
+        ),
+        'psr/http-factory' => array(
+            'pretty_version' => '1.0.1',
+            'version' => '1.0.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-factory',
+            'aliases' => array(),
+            'reference' => '12ac7fcd07e5b077433f5f2bee95b3a771bf61be',
+            'dev_requirement' => false,
+        ),
+        'psr/http-factory-implementation' => array(
             'dev_requirement' => false,
+            'provided' => array(
+                0 => '1.0',
+            ),
         ),
         'psr/http-message' => array(
             'pretty_version' => '1.0.1',
@@ -125,12 +155,12 @@
             ),
         ),
         'psr/log' => array(
-            'pretty_version' => '1.1.2',
-            'version' => '1.1.2.0',
+            'pretty_version' => '1.1.4',
+            'version' => '1.1.4.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/log',
             'aliases' => array(),
-            'reference' => '446d54b4cb6bf489fc9d75f55843658e6f25d801',
+            'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
             'dev_requirement' => false,
         ),
         'psr/log-implementation' => array(
@@ -148,22 +178,31 @@
             'reference' => '120b605dfeb996808c31b6477290a714d356e822',
             'dev_requirement' => false,
         ),
+        'symfony/deprecation-contracts' => array(
+            'pretty_version' => 'v3.0.0',
+            'version' => '3.0.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/deprecation-contracts',
+            'aliases' => array(),
+            'reference' => 'c726b64c1ccfe2896cb7df2e1331c357ad1c8ced',
+            'dev_requirement' => false,
+        ),
         'symfony/polyfill-ctype' => array(
-            'pretty_version' => 'v1.13.1',
-            'version' => '1.13.1.0',
+            'pretty_version' => 'v1.24.0',
+            'version' => '1.24.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
             'aliases' => array(),
-            'reference' => 'f8f0b461be3385e56d6de3dbb5a0df24c0c275e3',
+            'reference' => '30885182c981ab175d4d034db0f6f469898070ab',
             'dev_requirement' => false,
         ),
         'vlucas/phpdotenv' => array(
-            'pretty_version' => 'v3.6.0',
-            'version' => '3.6.0.0',
+            'pretty_version' => 'v3.6.10',
+            'version' => '3.6.10.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../vlucas/phpdotenv',
             'aliases' => array(),
-            'reference' => '1bdf24f065975594f6a117f0f1f6cabf1333b156',
+            'reference' => '5b547cdb25825f10251370f57ba5d9d924e6f68e',
             'dev_requirement' => false,
         ),
     ),

+ 0 - 26
vendor/composer/platform_check.php

@@ -1,26 +0,0 @@
-<?php
-
-// platform_check.php @generated by Composer
-
-$issues = array();
-
-if (!(PHP_VERSION_ID >= 70100)) {
-    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.1.0". You are running ' . PHP_VERSION . '.';
-}
-
-if ($issues) {
-    if (!headers_sent()) {
-        header('HTTP/1.1 500 Internal Server Error');
-    }
-    if (!ini_get('display_errors')) {
-        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
-            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
-        } elseif (!headers_sent()) {
-            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
-        }
-    }
-    trigger_error(
-        'Composer detected issues in your platform: ' . implode(' ', $issues),
-        E_USER_ERROR
-    );
-}

+ 0 - 23
vendor/guzzlehttp/guzzle/.php_cs

@@ -1,23 +0,0 @@
-<?php
-
-$config = PhpCsFixer\Config::create()
-    ->setRiskyAllowed(true)
-    ->setRules([
-        '@PSR2' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'declare_strict_types' => false,
-        'concat_space' => ['spacing'=>'one'],
-        'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
-        'ordered_imports' => true,
-        // 'phpdoc_align' => ['align'=>'vertical'],
-        // 'native_function_invocation' => true,
-    ])
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->in(__DIR__.'/src')
-            ->in(__DIR__.'/tests')
-            ->name('*.php')
-    )
-;
-
-return $config;

+ 1490 - 1322
vendor/guzzlehttp/guzzle/CHANGELOG.md

@@ -1,1322 +1,1490 @@
-# Change Log
-
-## 6.5.2 - 2019-12-23
-
-* idn_to_ascii() fix for old PHP versions [#2489](https://github.com/guzzle/guzzle/pull/2489)
-
-## 6.5.1 - 2019-12-21
-
-* Better defaults for PHP installations with old ICU lib [#2454](https://github.com/guzzle/guzzle/pull/2454)
-* IDN support for redirects [#2424](https://github.com/guzzle/guzzle/pull/2424)
-
-## 6.5.0 - 2019-12-07
-
-* Improvement: Added support for reset internal queue in MockHandler. [#2143](https://github.com/guzzle/guzzle/pull/2143)
-* Improvement: Added support to pass arbitrary options to `curl_multi_init`. [#2287](https://github.com/guzzle/guzzle/pull/2287)
-* Fix: Gracefully handle passing `null` to the `header` option. [#2132](https://github.com/guzzle/guzzle/pull/2132)
-* Fix: `RetryMiddleware` did not do exponential delay between retires due unit mismatch. [#2132](https://github.com/guzzle/guzzle/pull/2132)
-* Fix: Prevent undefined offset when using array for ssl_key options. [#2348](https://github.com/guzzle/guzzle/pull/2348)
-* Deprecated `ClientInterface::VERSION`
-
-## 6.4.1 - 2019-10-23
-
-* No `guzzle.phar` was created in 6.4.0 due expired API token. This release will fix that 
-* Added `parent::__construct()` to `FileCookieJar` and `SessionCookieJar`
-
-## 6.4.0 - 2019-10-23
-
-* Improvement: Improved error messages when using curl < 7.21.2 [#2108](https://github.com/guzzle/guzzle/pull/2108)
-* Fix: Test if response is readable before returning a summary in `RequestException::getResponseBodySummary()` [#2081](https://github.com/guzzle/guzzle/pull/2081)
-* Fix: Add support for GUZZLE_CURL_SELECT_TIMEOUT environment variable [#2161](https://github.com/guzzle/guzzle/pull/2161)
-* Improvement: Added `GuzzleHttp\Exception\InvalidArgumentException` [#2163](https://github.com/guzzle/guzzle/pull/2163)
-* Improvement: Added `GuzzleHttp\_current_time()` to use `hrtime()` if that function exists. [#2242](https://github.com/guzzle/guzzle/pull/2242)
-* Improvement: Added curl's `appconnect_time` in `TransferStats` [#2284](https://github.com/guzzle/guzzle/pull/2284)
-* Improvement: Make GuzzleException extend Throwable wherever it's available [#2273](https://github.com/guzzle/guzzle/pull/2273)
-* Fix: Prevent concurrent writes to file when saving `CookieJar` [#2335](https://github.com/guzzle/guzzle/pull/2335)
-* Improvement: Update `MockHandler` so we can test transfer time [#2362](https://github.com/guzzle/guzzle/pull/2362)
-
-## 6.3.3 - 2018-04-22
-
-* Fix: Default headers when decode_content is specified
-
-
-## 6.3.2 - 2018-03-26
-
-* Fix: Release process
-
-
-## 6.3.1 - 2018-03-26
-
-* Bug fix: Parsing 0 epoch expiry times in cookies [#2014](https://github.com/guzzle/guzzle/pull/2014)
-* Improvement: Better ConnectException detection [#2012](https://github.com/guzzle/guzzle/pull/2012)
-* Bug fix: Malformed domain that contains a "/" [#1999](https://github.com/guzzle/guzzle/pull/1999)
-* Bug fix: Undefined offset when a cookie has no first key-value pair [#1998](https://github.com/guzzle/guzzle/pull/1998)
-* Improvement: Support PHPUnit 6 [#1953](https://github.com/guzzle/guzzle/pull/1953)
-* Bug fix: Support empty headers [#1915](https://github.com/guzzle/guzzle/pull/1915)
-* Bug fix: Ignore case during header modifications [#1916](https://github.com/guzzle/guzzle/pull/1916)
-
-+ Minor code cleanups, documentation fixes and clarifications.
-
-
-## 6.3.0 - 2017-06-22
-
-* Feature: force IP resolution (ipv4 or ipv6) [#1608](https://github.com/guzzle/guzzle/pull/1608), [#1659](https://github.com/guzzle/guzzle/pull/1659)
-* Improvement: Don't include summary in exception message when body is empty [#1621](https://github.com/guzzle/guzzle/pull/1621)
-* Improvement: Handle `on_headers` option in MockHandler [#1580](https://github.com/guzzle/guzzle/pull/1580)
-* Improvement: Added SUSE Linux CA path [#1609](https://github.com/guzzle/guzzle/issues/1609)
-* Improvement: Use class reference for getting the name of the class instead of using hardcoded strings [#1641](https://github.com/guzzle/guzzle/pull/1641)
-* Feature: Added `read_timeout` option [#1611](https://github.com/guzzle/guzzle/pull/1611)
-* Bug fix: PHP 7.x fixes [#1685](https://github.com/guzzle/guzzle/pull/1685), [#1686](https://github.com/guzzle/guzzle/pull/1686), [#1811](https://github.com/guzzle/guzzle/pull/1811)
-* Deprecation: BadResponseException instantiation without a response [#1642](https://github.com/guzzle/guzzle/pull/1642)
-* Feature: Added NTLM auth [#1569](https://github.com/guzzle/guzzle/pull/1569)
-* Feature: Track redirect HTTP status codes [#1711](https://github.com/guzzle/guzzle/pull/1711)
-* Improvement: Check handler type during construction [#1745](https://github.com/guzzle/guzzle/pull/1745)
-* Improvement: Always include the Content-Length if there's a body [#1721](https://github.com/guzzle/guzzle/pull/1721)
-* Feature: Added convenience method to access a cookie by name [#1318](https://github.com/guzzle/guzzle/pull/1318)
-* Bug fix: Fill `CURLOPT_CAPATH` and `CURLOPT_CAINFO` properly [#1684](https://github.com/guzzle/guzzle/pull/1684)
-* Improvement:  	Use `\GuzzleHttp\Promise\rejection_for` function instead of object init [#1827](https://github.com/guzzle/guzzle/pull/1827)
-
-
-+ Minor code cleanups, documentation fixes and clarifications.
-
-## 6.2.3 - 2017-02-28
-
-* Fix deprecations with guzzle/psr7 version 1.4
-
-## 6.2.2 - 2016-10-08
-
-* Allow to pass nullable Response to delay callable
-* Only add scheme when host is present
-* Fix drain case where content-length is the literal string zero
-* Obfuscate in-URL credentials in exceptions
-
-## 6.2.1 - 2016-07-18
-
-* Address HTTP_PROXY security vulnerability, CVE-2016-5385:
-  https://httpoxy.org/
-* Fixing timeout bug with StreamHandler:
-  https://github.com/guzzle/guzzle/pull/1488
-* Only read up to `Content-Length` in PHP StreamHandler to avoid timeouts when
-  a server does not honor `Connection: close`.
-* Ignore URI fragment when sending requests.
-
-## 6.2.0 - 2016-03-21
-
-* Feature: added `GuzzleHttp\json_encode` and `GuzzleHttp\json_decode`.
-  https://github.com/guzzle/guzzle/pull/1389
-* Bug fix: Fix sleep calculation when waiting for delayed requests.
-  https://github.com/guzzle/guzzle/pull/1324
-* Feature: More flexible history containers.
-  https://github.com/guzzle/guzzle/pull/1373
-* Bug fix: defer sink stream opening in StreamHandler.
-  https://github.com/guzzle/guzzle/pull/1377
-* Bug fix: do not attempt to escape cookie values.
-  https://github.com/guzzle/guzzle/pull/1406
-* Feature: report original content encoding and length on decoded responses.
-  https://github.com/guzzle/guzzle/pull/1409
-* Bug fix: rewind seekable request bodies before dispatching to cURL.
-  https://github.com/guzzle/guzzle/pull/1422
-* Bug fix: provide an empty string to `http_build_query` for HHVM workaround.
-  https://github.com/guzzle/guzzle/pull/1367
-
-## 6.1.1 - 2015-11-22
-
-* Bug fix: Proxy::wrapSync() now correctly proxies to the appropriate handler
-  https://github.com/guzzle/guzzle/commit/911bcbc8b434adce64e223a6d1d14e9a8f63e4e4
-* Feature: HandlerStack is now more generic.
-  https://github.com/guzzle/guzzle/commit/f2102941331cda544745eedd97fc8fd46e1ee33e
-* Bug fix: setting verify to false in the StreamHandler now disables peer
-  verification. https://github.com/guzzle/guzzle/issues/1256
-* Feature: Middleware now uses an exception factory, including more error
-  context. https://github.com/guzzle/guzzle/pull/1282
-* Feature: better support for disabled functions.
-  https://github.com/guzzle/guzzle/pull/1287
-* Bug fix: fixed regression where MockHandler was not using `sink`.
-  https://github.com/guzzle/guzzle/pull/1292
-
-## 6.1.0 - 2015-09-08
-
-* Feature: Added the `on_stats` request option to provide access to transfer
-  statistics for requests. https://github.com/guzzle/guzzle/pull/1202
-* Feature: Added the ability to persist session cookies in CookieJars.
-  https://github.com/guzzle/guzzle/pull/1195
-* Feature: Some compatibility updates for Google APP Engine
-  https://github.com/guzzle/guzzle/pull/1216
-* Feature: Added support for NO_PROXY to prevent the use of a proxy based on
-  a simple set of rules. https://github.com/guzzle/guzzle/pull/1197
-* Feature: Cookies can now contain square brackets.
-  https://github.com/guzzle/guzzle/pull/1237
-* Bug fix: Now correctly parsing `=` inside of quotes in Cookies.
-  https://github.com/guzzle/guzzle/pull/1232
-* Bug fix: Cusotm cURL options now correctly override curl options of the
-  same name. https://github.com/guzzle/guzzle/pull/1221
-* Bug fix: Content-Type header is now added when using an explicitly provided
-  multipart body. https://github.com/guzzle/guzzle/pull/1218
-* Bug fix: Now ignoring Set-Cookie headers that have no name.
-* Bug fix: Reason phrase is no longer cast to an int in some cases in the
-  cURL handler. https://github.com/guzzle/guzzle/pull/1187
-* Bug fix: Remove the Authorization header when redirecting if the Host
-  header changes. https://github.com/guzzle/guzzle/pull/1207
-* Bug fix: Cookie path matching fixes
-  https://github.com/guzzle/guzzle/issues/1129
-* Bug fix: Fixing the cURL `body_as_string` setting
-  https://github.com/guzzle/guzzle/pull/1201
-* Bug fix: quotes are no longer stripped when parsing cookies.
-  https://github.com/guzzle/guzzle/issues/1172
-* Bug fix: `form_params` and `query` now always uses the `&` separator.
-  https://github.com/guzzle/guzzle/pull/1163
-* Bug fix: Adding a Content-Length to PHP stream wrapper requests if not set.
-  https://github.com/guzzle/guzzle/pull/1189
-
-## 6.0.2 - 2015-07-04
-
-* Fixed a memory leak in the curl handlers in which references to callbacks
-  were not being removed by `curl_reset`.
-* Cookies are now extracted properly before redirects.
-* Cookies now allow more character ranges.
-* Decoded Content-Encoding responses are now modified to correctly reflect
-  their state if the encoding was automatically removed by a handler. This
-  means that the `Content-Encoding` header may be removed an the
-  `Content-Length` modified to reflect the message size after removing the
-  encoding.
-* Added a more explicit error message when trying to use `form_params` and
-  `multipart` in the same request.
-* Several fixes for HHVM support.
-* Functions are now conditionally required using an additional level of
-  indirection to help with global Composer installations.
-
-## 6.0.1 - 2015-05-27
-
-* Fixed a bug with serializing the `query` request option where the `&`
-  separator was missing.
-* Added a better error message for when `body` is provided as an array. Please
-  use `form_params` or `multipart` instead.
-* Various doc fixes.
-
-## 6.0.0 - 2015-05-26
-
-* See the UPGRADING.md document for more information.
-* Added `multipart` and `form_params` request options.
-* Added `synchronous` request option.
-* Added the `on_headers` request option.
-* Fixed `expect` handling.
-* No longer adding default middlewares in the client ctor. These need to be
-  present on the provided handler in order to work.
-* Requests are no longer initiated when sending async requests with the
-  CurlMultiHandler. This prevents unexpected recursion from requests completing
-  while ticking the cURL loop.
-* Removed the semantics of setting `default` to `true`. This is no longer
-  required now that the cURL loop is not ticked for async requests.
-* Added request and response logging middleware.
-* No longer allowing self signed certificates when using the StreamHandler.
-* Ensuring that `sink` is valid if saving to a file.
-* Request exceptions now include a "handler context" which provides handler
-  specific contextual information.
-* Added `GuzzleHttp\RequestOptions` to allow request options to be applied
-  using constants.
-* `$maxHandles` has been removed from CurlMultiHandler.
-* `MultipartPostBody` is now part of the `guzzlehttp/psr7` package.
-
-## 5.3.0 - 2015-05-19
-
-* Mock now supports `save_to`
-* Marked `AbstractRequestEvent::getTransaction()` as public.
-* Fixed a bug in which multiple headers using different casing would overwrite
-  previous headers in the associative array.
-* Added `Utils::getDefaultHandler()`
-* Marked `GuzzleHttp\Client::getDefaultUserAgent` as deprecated.
-* URL scheme is now always lowercased.
-
-## 6.0.0-beta.1
-
-* Requires PHP >= 5.5
-* Updated to use PSR-7
-  * Requires immutable messages, which basically means an event based system
-    owned by a request instance is no longer possible.
-  * Utilizing the [Guzzle PSR-7 package](https://github.com/guzzle/psr7).
-  * Removed the dependency on `guzzlehttp/streams`. These stream abstractions
-    are available in the `guzzlehttp/psr7` package under the `GuzzleHttp\Psr7`
-    namespace.
-* Added middleware and handler system
-  * Replaced the Guzzle event and subscriber system with a middleware system.
-  * No longer depends on RingPHP, but rather places the HTTP handlers directly
-    in Guzzle, operating on PSR-7 messages.
-  * Retry logic is now encapsulated in `GuzzleHttp\Middleware::retry`, which
-    means the `guzzlehttp/retry-subscriber` is now obsolete.
-  * Mocking responses is now handled using `GuzzleHttp\Handler\MockHandler`.
-* Asynchronous responses
-  * No longer supports the `future` request option to send an async request.
-    Instead, use one of the `*Async` methods of a client (e.g., `requestAsync`,
-    `getAsync`, etc.).
-  * Utilizing `GuzzleHttp\Promise` instead of React's promise library to avoid
-    recursion required by chaining and forwarding react promises. See
-    https://github.com/guzzle/promises
-  * Added `requestAsync` and `sendAsync` to send request asynchronously.
-  * Added magic methods for `getAsync()`, `postAsync()`, etc. to send requests
-    asynchronously.
-* Request options
-  * POST and form updates
-    * Added the `form_fields` and `form_files` request options.
-    * Removed the `GuzzleHttp\Post` namespace.
-    * The `body` request option no longer accepts an array for POST requests.
-  * The `exceptions` request option has been deprecated in favor of the
-    `http_errors` request options.
-  * The `save_to` request option has been deprecated in favor of `sink` request
-    option.
-* Clients no longer accept an array of URI template string and variables for
-  URI variables. You will need to expand URI templates before passing them
-  into a client constructor or request method.
-* Client methods `get()`, `post()`, `put()`, `patch()`, `options()`, etc. are
-  now magic methods that will send synchronous requests.
-* Replaced `Utils.php` with plain functions in `functions.php`.
-* Removed `GuzzleHttp\Collection`.
-* Removed `GuzzleHttp\BatchResults`. Batched pool results are now returned as
-  an array.
-* Removed `GuzzleHttp\Query`. Query string handling is now handled using an
-  associative array passed into the `query` request option. The query string
-  is serialized using PHP's `http_build_query`. If you need more control, you
-  can pass the query string in as a string.
-* `GuzzleHttp\QueryParser` has been replaced with the
-  `GuzzleHttp\Psr7\parse_query`.
-
-## 5.2.0 - 2015-01-27
-
-* Added `AppliesHeadersInterface` to make applying headers to a request based
-  on the body more generic and not specific to `PostBodyInterface`.
-* Reduced the number of stack frames needed to send requests.
-* Nested futures are now resolved in the client rather than the RequestFsm
-* Finishing state transitions is now handled in the RequestFsm rather than the
-  RingBridge.
-* Added a guard in the Pool class to not use recursion for request retries.
-
-## 5.1.0 - 2014-12-19
-
-* Pool class no longer uses recursion when a request is intercepted.
-* The size of a Pool can now be dynamically adjusted using a callback.
-  See https://github.com/guzzle/guzzle/pull/943.
-* Setting a request option to `null` when creating a request with a client will
-  ensure that the option is not set. This allows you to overwrite default
-  request options on a per-request basis.
-  See https://github.com/guzzle/guzzle/pull/937.
-* Added the ability to limit which protocols are allowed for redirects by
-  specifying a `protocols` array in the `allow_redirects` request option.
-* Nested futures due to retries are now resolved when waiting for synchronous
-  responses. See https://github.com/guzzle/guzzle/pull/947.
-* `"0"` is now an allowed URI path. See
-  https://github.com/guzzle/guzzle/pull/935.
-* `Query` no longer typehints on the `$query` argument in the constructor,
-  allowing for strings and arrays.
-* Exceptions thrown in the `end` event are now correctly wrapped with Guzzle
-  specific exceptions if necessary.
-
-## 5.0.3 - 2014-11-03
-
-This change updates query strings so that they are treated as un-encoded values
-by default where the value represents an un-encoded value to send over the
-wire. A Query object then encodes the value before sending over the wire. This
-means that even value query string values (e.g., ":") are url encoded. This
-makes the Query class match PHP's http_build_query function. However, if you
-want to send requests over the wire using valid query string characters that do
-not need to be encoded, then you can provide a string to Url::setQuery() and
-pass true as the second argument to specify that the query string is a raw
-string that should not be parsed or encoded (unless a call to getQuery() is
-subsequently made, forcing the query-string to be converted into a Query
-object).
-
-## 5.0.2 - 2014-10-30
-
-* Added a trailing `\r\n` to multipart/form-data payloads. See
-  https://github.com/guzzle/guzzle/pull/871
-* Added a `GuzzleHttp\Pool::send()` convenience method to match the docs.
-* Status codes are now returned as integers. See
-  https://github.com/guzzle/guzzle/issues/881
-* No longer overwriting an existing `application/x-www-form-urlencoded` header
-  when sending POST requests, allowing for customized headers. See
-  https://github.com/guzzle/guzzle/issues/877
-* Improved path URL serialization.
-
-  * No longer double percent-encoding characters in the path or query string if
-    they are already encoded.
-  * Now properly encoding the supplied path to a URL object, instead of only
-    encoding ' ' and '?'.
-  * Note: This has been changed in 5.0.3 to now encode query string values by
-    default unless the `rawString` argument is provided when setting the query
-    string on a URL: Now allowing many more characters to be present in the
-    query string without being percent encoded. See http://tools.ietf.org/html/rfc3986#appendix-A
-
-## 5.0.1 - 2014-10-16
-
-Bugfix release.
-
-* Fixed an issue where connection errors still returned response object in
-  error and end events event though the response is unusable. This has been
-  corrected so that a response is not returned in the `getResponse` method of
-  these events if the response did not complete. https://github.com/guzzle/guzzle/issues/867
-* Fixed an issue where transfer statistics were not being populated in the
-  RingBridge. https://github.com/guzzle/guzzle/issues/866
-
-## 5.0.0 - 2014-10-12
-
-Adding support for non-blocking responses and some minor API cleanup.
-
-### New Features
-
-* Added support for non-blocking responses based on `guzzlehttp/guzzle-ring`.
-* Added a public API for creating a default HTTP adapter.
-* Updated the redirect plugin to be non-blocking so that redirects are sent
-  concurrently. Other plugins like this can now be updated to be non-blocking.
-* Added a "progress" event so that you can get upload and download progress
-  events.
-* Added `GuzzleHttp\Pool` which implements FutureInterface and transfers
-  requests concurrently using a capped pool size as efficiently as possible.
-* Added `hasListeners()` to EmitterInterface.
-* Removed `GuzzleHttp\ClientInterface::sendAll` and marked
-  `GuzzleHttp\Client::sendAll` as deprecated (it's still there, just not the
-  recommended way).
-
-### Breaking changes
-
-The breaking changes in this release are relatively minor. The biggest thing to
-look out for is that request and response objects no longer implement fluent
-interfaces.
-
-* Removed the fluent interfaces (i.e., `return $this`) from requests,
-  responses, `GuzzleHttp\Collection`, `GuzzleHttp\Url`,
-  `GuzzleHttp\Query`, `GuzzleHttp\Post\PostBody`, and
-  `GuzzleHttp\Cookie\SetCookie`. This blog post provides a good outline of
-  why I did this: http://ocramius.github.io/blog/fluent-interfaces-are-evil/.
-  This also makes the Guzzle message interfaces compatible with the current
-  PSR-7 message proposal.
-* Removed "functions.php", so that Guzzle is truly PSR-4 compliant. Except
-  for the HTTP request functions from function.php, these functions are now
-  implemented in `GuzzleHttp\Utils` using camelCase. `GuzzleHttp\json_decode`
-  moved to `GuzzleHttp\Utils::jsonDecode`. `GuzzleHttp\get_path` moved to
-  `GuzzleHttp\Utils::getPath`. `GuzzleHttp\set_path` moved to
-  `GuzzleHttp\Utils::setPath`. `GuzzleHttp\batch` should now be
-  `GuzzleHttp\Pool::batch`, which returns an `objectStorage`. Using functions.php
-  caused problems for many users: they aren't PSR-4 compliant, require an
-  explicit include, and needed an if-guard to ensure that the functions are not
-  declared multiple times.
-* Rewrote adapter layer.
-    * Removing all classes from `GuzzleHttp\Adapter`, these are now
-      implemented as callables that are stored in `GuzzleHttp\Ring\Client`.
-    * Removed the concept of "parallel adapters". Sending requests serially or
-      concurrently is now handled using a single adapter.
-    * Moved `GuzzleHttp\Adapter\Transaction` to `GuzzleHttp\Transaction`. The
-      Transaction object now exposes the request, response, and client as public
-      properties. The getters and setters have been removed.
-* Removed the "headers" event. This event was only useful for changing the
-  body a response once the headers of the response were known. You can implement
-  a similar behavior in a number of ways. One example might be to use a
-  FnStream that has access to the transaction being sent. For example, when the
-  first byte is written, you could check if the response headers match your
-  expectations, and if so, change the actual stream body that is being
-  written to.
-* Removed the `asArray` parameter from
-  `GuzzleHttp\Message\MessageInterface::getHeader`. If you want to get a header
-  value as an array, then use the newly added `getHeaderAsArray()` method of
-  `MessageInterface`. This change makes the Guzzle interfaces compatible with
-  the PSR-7 interfaces.
-* `GuzzleHttp\Message\MessageFactory` no longer allows subclasses to add
-  custom request options using double-dispatch (this was an implementation
-  detail). Instead, you should now provide an associative array to the
-  constructor which is a mapping of the request option name mapping to a
-  function that applies the option value to a request.
-* Removed the concept of "throwImmediately" from exceptions and error events.
-  This control mechanism was used to stop a transfer of concurrent requests
-  from completing. This can now be handled by throwing the exception or by
-  cancelling a pool of requests or each outstanding future request individually.
-* Updated to "GuzzleHttp\Streams" 3.0.
-    * `GuzzleHttp\Stream\StreamInterface::getContents()` no longer accepts a
-      `maxLen` parameter. This update makes the Guzzle streams project
-      compatible with the current PSR-7 proposal.
-    * `GuzzleHttp\Stream\Stream::__construct`,
-      `GuzzleHttp\Stream\Stream::factory`, and
-      `GuzzleHttp\Stream\Utils::create` no longer accept a size in the second
-      argument. They now accept an associative array of options, including the
-      "size" key and "metadata" key which can be used to provide custom metadata.
-
-## 4.2.2 - 2014-09-08
-
-* Fixed a memory leak in the CurlAdapter when reusing cURL handles.
-* No longer using `request_fulluri` in stream adapter proxies.
-* Relative redirects are now based on the last response, not the first response.
-
-## 4.2.1 - 2014-08-19
-
-* Ensuring that the StreamAdapter does not always add a Content-Type header
-* Adding automated github releases with a phar and zip
-
-## 4.2.0 - 2014-08-17
-
-* Now merging in default options using a case-insensitive comparison.
-  Closes https://github.com/guzzle/guzzle/issues/767
-* Added the ability to automatically decode `Content-Encoding` response bodies
-  using the `decode_content` request option. This is set to `true` by default
-  to decode the response body if it comes over the wire with a
-  `Content-Encoding`. Set this value to `false` to disable decoding the
-  response content, and pass a string to provide a request `Accept-Encoding`
-  header and turn on automatic response decoding. This feature now allows you
-  to pass an `Accept-Encoding` header in the headers of a request but still
-  disable automatic response decoding.
-  Closes https://github.com/guzzle/guzzle/issues/764
-* Added the ability to throw an exception immediately when transferring
-  requests in parallel. Closes https://github.com/guzzle/guzzle/issues/760
-* Updating guzzlehttp/streams dependency to ~2.1
-* No longer utilizing the now deprecated namespaced methods from the stream
-  package.
-
-## 4.1.8 - 2014-08-14
-
-* Fixed an issue in the CurlFactory that caused setting the `stream=false`
-  request option to throw an exception.
-  See: https://github.com/guzzle/guzzle/issues/769
-* TransactionIterator now calls rewind on the inner iterator.
-  See: https://github.com/guzzle/guzzle/pull/765
-* You can now set the `Content-Type` header to `multipart/form-data`
-  when creating POST requests to force multipart bodies.
-  See https://github.com/guzzle/guzzle/issues/768
-
-## 4.1.7 - 2014-08-07
-
-* Fixed an error in the HistoryPlugin that caused the same request and response
-  to be logged multiple times when an HTTP protocol error occurs.
-* Ensuring that cURL does not add a default Content-Type when no Content-Type
-  has been supplied by the user. This prevents the adapter layer from modifying
-  the request that is sent over the wire after any listeners may have already
-  put the request in a desired state (e.g., signed the request).
-* Throwing an exception when you attempt to send requests that have the
-  "stream" set to true in parallel using the MultiAdapter.
-* Only calling curl_multi_select when there are active cURL handles. This was
-  previously changed and caused performance problems on some systems due to PHP
-  always selecting until the maximum select timeout.
-* Fixed a bug where multipart/form-data POST fields were not correctly
-  aggregated (e.g., values with "&").
-
-## 4.1.6 - 2014-08-03
-
-* Added helper methods to make it easier to represent messages as strings,
-  including getting the start line and getting headers as a string.
-
-## 4.1.5 - 2014-08-02
-
-* Automatically retrying cURL "Connection died, retrying a fresh connect"
-  errors when possible.
-* cURL implementation cleanup
-* Allowing multiple event subscriber listeners to be registered per event by
-  passing an array of arrays of listener configuration.
-
-## 4.1.4 - 2014-07-22
-
-* Fixed a bug that caused multi-part POST requests with more than one field to
-  serialize incorrectly.
-* Paths can now be set to "0"
-* `ResponseInterface::xml` now accepts a `libxml_options` option and added a
-  missing default argument that was required when parsing XML response bodies.
-* A `save_to` stream is now created lazily, which means that files are not
-  created on disk unless a request succeeds.
-
-## 4.1.3 - 2014-07-15
-
-* Various fixes to multipart/form-data POST uploads
-* Wrapping function.php in an if-statement to ensure Guzzle can be used
-  globally and in a Composer install
-* Fixed an issue with generating and merging in events to an event array
-* POST headers are only applied before sending a request to allow you to change
-  the query aggregator used before uploading
-* Added much more robust query string parsing
-* Fixed various parsing and normalization issues with URLs
-* Fixing an issue where multi-valued headers were not being utilized correctly
-  in the StreamAdapter
-
-## 4.1.2 - 2014-06-18
-
-* Added support for sending payloads with GET requests
-
-## 4.1.1 - 2014-06-08
-
-* Fixed an issue related to using custom message factory options in subclasses
-* Fixed an issue with nested form fields in a multi-part POST
-* Fixed an issue with using the `json` request option for POST requests
-* Added `ToArrayInterface` to `GuzzleHttp\Cookie\CookieJar`
-
-## 4.1.0 - 2014-05-27
-
-* Added a `json` request option to easily serialize JSON payloads.
-* Added a `GuzzleHttp\json_decode()` wrapper to safely parse JSON.
-* Added `setPort()` and `getPort()` to `GuzzleHttp\Message\RequestInterface`.
-* Added the ability to provide an emitter to a client in the client constructor.
-* Added the ability to persist a cookie session using $_SESSION.
-* Added a trait that can be used to add event listeners to an iterator.
-* Removed request method constants from RequestInterface.
-* Fixed warning when invalid request start-lines are received.
-* Updated MessageFactory to work with custom request option methods.
-* Updated cacert bundle to latest build.
-
-4.0.2 (2014-04-16)
-------------------
-
-* Proxy requests using the StreamAdapter now properly use request_fulluri (#632)
-* Added the ability to set scalars as POST fields (#628)
-
-## 4.0.1 - 2014-04-04
-
-* The HTTP status code of a response is now set as the exception code of
-  RequestException objects.
-* 303 redirects will now correctly switch from POST to GET requests.
-* The default parallel adapter of a client now correctly uses the MultiAdapter.
-* HasDataTrait now initializes the internal data array as an empty array so
-  that the toArray() method always returns an array.
-
-## 4.0.0 - 2014-03-29
-
-* For more information on the 4.0 transition, see:
-  http://mtdowling.com/blog/2014/03/15/guzzle-4-rc/
-* For information on changes and upgrading, see:
-  https://github.com/guzzle/guzzle/blob/master/UPGRADING.md#3x-to-40
-* Added `GuzzleHttp\batch()` as a convenience function for sending requests in
-  parallel without needing to write asynchronous code.
-* Restructured how events are added to `GuzzleHttp\ClientInterface::sendAll()`.
-  You can now pass a callable or an array of associative arrays where each
-  associative array contains the "fn", "priority", and "once" keys.
-
-## 4.0.0.rc-2 - 2014-03-25
-
-* Removed `getConfig()` and `setConfig()` from clients to avoid confusion
-  around whether things like base_url, message_factory, etc. should be able to
-  be retrieved or modified.
-* Added `getDefaultOption()` and `setDefaultOption()` to ClientInterface
-* functions.php functions were renamed using snake_case to match PHP idioms
-* Added support for `HTTP_PROXY`, `HTTPS_PROXY`, and
-  `GUZZLE_CURL_SELECT_TIMEOUT` environment variables
-* Added the ability to specify custom `sendAll()` event priorities
-* Added the ability to specify custom stream context options to the stream
-  adapter.
-* Added a functions.php function for `get_path()` and `set_path()`
-* CurlAdapter and MultiAdapter now use a callable to generate curl resources
-* MockAdapter now properly reads a body and emits a `headers` event
-* Updated Url class to check if a scheme and host are set before adding ":"
-  and "//". This allows empty Url (e.g., "") to be serialized as "".
-* Parsing invalid XML no longer emits warnings
-* Curl classes now properly throw AdapterExceptions
-* Various performance optimizations
-* Streams are created with the faster `Stream\create()` function
-* Marked deprecation_proxy() as internal
-* Test server is now a collection of static methods on a class
-
-## 4.0.0-rc.1 - 2014-03-15
-
-* See https://github.com/guzzle/guzzle/blob/master/UPGRADING.md#3x-to-40
-
-## 3.8.1 - 2014-01-28
-
-* Bug: Always using GET requests when redirecting from a 303 response
-* Bug: CURLOPT_SSL_VERIFYHOST is now correctly set to false when setting `$certificateAuthority` to false in
-  `Guzzle\Http\ClientInterface::setSslVerification()`
-* Bug: RedirectPlugin now uses strict RFC 3986 compliance when combining a base URL with a relative URL
-* Bug: The body of a request can now be set to `"0"`
-* Sending PHP stream requests no longer forces `HTTP/1.0`
-* Adding more information to ExceptionCollection exceptions so that users have more context, including a stack trace of
-  each sub-exception
-* Updated the `$ref` attribute in service descriptions to merge over any existing parameters of a schema (rather than
-  clobbering everything).
-* Merging URLs will now use the query string object from the relative URL (thus allowing custom query aggregators)
-* Query strings are now parsed in a way that they do no convert empty keys with no value to have a dangling `=`.
-  For example `foo&bar=baz` is now correctly parsed and recognized as `foo&bar=baz` rather than `foo=&bar=baz`.
-* Now properly escaping the regular expression delimiter when matching Cookie domains.
-* Network access is now disabled when loading XML documents
-
-## 3.8.0 - 2013-12-05
-
-* Added the ability to define a POST name for a file
-* JSON response parsing now properly walks additionalProperties
-* cURL error code 18 is now retried automatically in the BackoffPlugin
-* Fixed a cURL error when URLs contain fragments
-* Fixed an issue in the BackoffPlugin retry event where it was trying to access all exceptions as if they were
-  CurlExceptions
-* CURLOPT_PROGRESS function fix for PHP 5.5 (69fcc1e)
-* Added the ability for Guzzle to work with older versions of cURL that do not support `CURLOPT_TIMEOUT_MS`
-* Fixed a bug that was encountered when parsing empty header parameters
-* UriTemplate now has a `setRegex()` method to match the docs
-* The `debug` request parameter now checks if it is truthy rather than if it exists
-* Setting the `debug` request parameter to true shows verbose cURL output instead of using the LogPlugin
-* Added the ability to combine URLs using strict RFC 3986 compliance
-* Command objects can now return the validation errors encountered by the command
-* Various fixes to cache revalidation (#437 and 29797e5)
-* Various fixes to the AsyncPlugin
-* Cleaned up build scripts
-
-## 3.7.4 - 2013-10-02
-
-* Bug fix: 0 is now an allowed value in a description parameter that has a default value (#430)
-* Bug fix: SchemaFormatter now returns an integer when formatting to a Unix timestamp
-  (see https://github.com/aws/aws-sdk-php/issues/147)
-* Bug fix: Cleaned up and fixed URL dot segment removal to properly resolve internal dots
-* Minimum PHP version is now properly specified as 5.3.3 (up from 5.3.2) (#420)
-* Updated the bundled cacert.pem (#419)
-* OauthPlugin now supports adding authentication to headers or query string (#425)
-
-## 3.7.3 - 2013-09-08
-
-* Added the ability to get the exception associated with a request/command when using `MultiTransferException` and
-  `CommandTransferException`.
-* Setting `additionalParameters` of a response to false is now honored when parsing responses with a service description
-* Schemas are only injected into response models when explicitly configured.
-* No longer guessing Content-Type based on the path of a request. Content-Type is now only guessed based on the path of
-  an EntityBody.
-* Bug fix: ChunkedIterator can now properly chunk a \Traversable as well as an \Iterator.
-* Bug fix: FilterIterator now relies on `\Iterator` instead of `\Traversable`.
-* Bug fix: Gracefully handling malformed responses in RequestMediator::writeResponseBody()
-* Bug fix: Replaced call to canCache with canCacheRequest in the CallbackCanCacheStrategy of the CachePlugin
-* Bug fix: Visiting XML attributes first before visiting XML children when serializing requests
-* Bug fix: Properly parsing headers that contain commas contained in quotes
-* Bug fix: mimetype guessing based on a filename is now case-insensitive
-
-## 3.7.2 - 2013-08-02
-
-* Bug fix: Properly URL encoding paths when using the PHP-only version of the UriTemplate expander
-  See https://github.com/guzzle/guzzle/issues/371
-* Bug fix: Cookie domains are now matched correctly according to RFC 6265
-  See https://github.com/guzzle/guzzle/issues/377
-* Bug fix: GET parameters are now used when calculating an OAuth signature
-* Bug fix: Fixed an issue with cache revalidation where the If-None-Match header was being double quoted
-* `Guzzle\Common\AbstractHasDispatcher::dispatch()` now returns the event that was dispatched
-* `Guzzle\Http\QueryString::factory()` now guesses the most appropriate query aggregator to used based on the input.
-  See https://github.com/guzzle/guzzle/issues/379
-* Added a way to add custom domain objects to service description parsing using the `operation.parse_class` event. See
-  https://github.com/guzzle/guzzle/pull/380
-* cURL multi cleanup and optimizations
-
-## 3.7.1 - 2013-07-05
-
-* Bug fix: Setting default options on a client now works
-* Bug fix: Setting options on HEAD requests now works. See #352
-* Bug fix: Moving stream factory before send event to before building the stream. See #353
-* Bug fix: Cookies no longer match on IP addresses per RFC 6265
-* Bug fix: Correctly parsing header parameters that are in `<>` and quotes
-* Added `cert` and `ssl_key` as request options
-* `Host` header can now diverge from the host part of a URL if the header is set manually
-* `Guzzle\Service\Command\LocationVisitor\Request\XmlVisitor` was rewritten to change from using SimpleXML to XMLWriter
-* OAuth parameters are only added via the plugin if they aren't already set
-* Exceptions are now thrown when a URL cannot be parsed
-* Returning `false` if `Guzzle\Http\EntityBody::getContentMd5()` fails
-* Not setting a `Content-MD5` on a command if calculating the Content-MD5 fails via the CommandContentMd5Plugin
-
-## 3.7.0 - 2013-06-10
-
-* See UPGRADING.md for more information on how to upgrade.
-* Requests now support the ability to specify an array of $options when creating a request to more easily modify a
-  request. You can pass a 'request.options' configuration setting to a client to apply default request options to
-  every request created by a client (e.g. default query string variables, headers, curl options, etc.).
-* Added a static facade class that allows you to use Guzzle with static methods and mount the class to `\Guzzle`.
-  See `Guzzle\Http\StaticClient::mount`.
-* Added `command.request_options` to `Guzzle\Service\Command\AbstractCommand` to pass request options to requests
-      created by a command (e.g. custom headers, query string variables, timeout settings, etc.).
-* Stream size in `Guzzle\Stream\PhpStreamRequestFactory` will now be set if Content-Length is returned in the
-  headers of a response
-* Added `Guzzle\Common\Collection::setPath($path, $value)` to set a value into an array using a nested key
-  (e.g. `$collection->setPath('foo/baz/bar', 'test'); echo $collection['foo']['bar']['bar'];`)
-* ServiceBuilders now support storing and retrieving arbitrary data
-* CachePlugin can now purge all resources for a given URI
-* CachePlugin can automatically purge matching cached items when a non-idempotent request is sent to a resource
-* CachePlugin now uses the Vary header to determine if a resource is a cache hit
-* `Guzzle\Http\Message\Response` now implements `\Serializable`
-* Added `Guzzle\Cache\CacheAdapterFactory::fromCache()` to more easily create cache adapters
-* `Guzzle\Service\ClientInterface::execute()` now accepts an array, single command, or Traversable
-* Fixed a bug in `Guzzle\Http\Message\Header\Link::addLink()`
-* Better handling of calculating the size of a stream in `Guzzle\Stream\Stream` using fstat() and caching the size
-* `Guzzle\Common\Exception\ExceptionCollection` now creates a more readable exception message
-* Fixing BC break: Added back the MonologLogAdapter implementation rather than extending from PsrLog so that older
-  Symfony users can still use the old version of Monolog.
-* Fixing BC break: Added the implementation back in for `Guzzle\Http\Message\AbstractMessage::getTokenizedHeader()`.
-  Now triggering an E_USER_DEPRECATED warning when used. Use `$message->getHeader()->parseParams()`.
-* Several performance improvements to `Guzzle\Common\Collection`
-* Added an `$options` argument to the end of the following methods of `Guzzle\Http\ClientInterface`:
-  createRequest, head, delete, put, patch, post, options, prepareRequest
-* Added an `$options` argument to the end of `Guzzle\Http\Message\Request\RequestFactoryInterface::createRequest()`
-* Added an `applyOptions()` method to `Guzzle\Http\Message\Request\RequestFactoryInterface`
-* Changed `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $body = null)` to
-  `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $options = array())`. You can still pass in a
-  resource, string, or EntityBody into the $options parameter to specify the download location of the response.
-* Changed `Guzzle\Common\Collection::__construct($data)` to no longer accepts a null value for `$data` but a
-  default `array()`
-* Added `Guzzle\Stream\StreamInterface::isRepeatable`
-* Removed `Guzzle\Http\ClientInterface::setDefaultHeaders(). Use
-  $client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`. or
-  $client->getConfig()->setPath('request.options/headers', array('header_name' => 'value'))`.
-* Removed `Guzzle\Http\ClientInterface::getDefaultHeaders(). Use $client->getConfig()->getPath('request.options/headers')`.
-* Removed `Guzzle\Http\ClientInterface::expandTemplate()`
-* Removed `Guzzle\Http\ClientInterface::setRequestFactory()`
-* Removed `Guzzle\Http\ClientInterface::getCurlMulti()`
-* Removed `Guzzle\Http\Message\RequestInterface::canCache`
-* Removed `Guzzle\Http\Message\RequestInterface::setIsRedirect`
-* Removed `Guzzle\Http\Message\RequestInterface::isRedirect`
-* Made `Guzzle\Http\Client::expandTemplate` and `getUriTemplate` protected methods.
-* You can now enable E_USER_DEPRECATED warnings to see if you are using a deprecated method by setting
-  `Guzzle\Common\Version::$emitWarnings` to true.
-* Marked `Guzzle\Http\Message\Request::isResponseBodyRepeatable()` as deprecated. Use
-      `$request->getResponseBody()->isRepeatable()` instead.
-* Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use
-  `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-* Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use
-  `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-* Marked `Guzzle\Http\Message\Request::setIsRedirect()` as deprecated. Use the HistoryPlugin instead.
-* Marked `Guzzle\Http\Message\Request::isRedirect()` as deprecated. Use the HistoryPlugin instead.
-* Marked `Guzzle\Cache\CacheAdapterFactory::factory()` as deprecated
-* Marked 'command.headers', 'command.response_body' and 'command.on_complete' as deprecated for AbstractCommand.
-  These will work through Guzzle 4.0
-* Marked 'request.params' for `Guzzle\Http\Client` as deprecated. Use [request.options][params].
-* Marked `Guzzle\Service\Client::enableMagicMethods()` as deprecated. Magic methods can no longer be disabled on a Guzzle\Service\Client.
-* Marked `Guzzle\Service\Client::getDefaultHeaders()` as deprecated. Use $client->getConfig()->getPath('request.options/headers')`.
-* Marked `Guzzle\Service\Client::setDefaultHeaders()` as deprecated. Use $client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`.
-* Marked `Guzzle\Parser\Url\UrlParser` as deprecated. Just use PHP's `parse_url()` and percent encode your UTF-8.
-* Marked `Guzzle\Common\Collection::inject()` as deprecated.
-* Marked `Guzzle\Plugin\CurlAuth\CurlAuthPlugin` as deprecated. Use `$client->getConfig()->setPath('request.options/auth', array('user', 'pass', 'Basic|Digest');`
-* CacheKeyProviderInterface and DefaultCacheKeyProvider are no longer used. All of this logic is handled in a
-  CacheStorageInterface. These two objects and interface will be removed in a future version.
-* Always setting X-cache headers on cached responses
-* Default cache TTLs are now handled by the CacheStorageInterface of a CachePlugin
-* `CacheStorageInterface::cache($key, Response $response, $ttl = null)` has changed to `cache(RequestInterface
-  $request, Response $response);`
-* `CacheStorageInterface::fetch($key)` has changed to `fetch(RequestInterface $request);`
-* `CacheStorageInterface::delete($key)` has changed to `delete(RequestInterface $request);`
-* Added `CacheStorageInterface::purge($url)`
-* `DefaultRevalidation::__construct(CacheKeyProviderInterface $cacheKey, CacheStorageInterface $cache, CachePlugin
-  $plugin)` has changed to `DefaultRevalidation::__construct(CacheStorageInterface $cache,
-  CanCacheStrategyInterface $canCache = null)`
-* Added `RevalidationInterface::shouldRevalidate(RequestInterface $request, Response $response)`
-
-## 3.6.0 - 2013-05-29
-
-* ServiceDescription now implements ToArrayInterface
-* Added command.hidden_params to blacklist certain headers from being treated as additionalParameters
-* Guzzle can now correctly parse incomplete URLs
-* Mixed casing of headers are now forced to be a single consistent casing across all values for that header.
-* Messages internally use a HeaderCollection object to delegate handling case-insensitive header resolution
-* Removed the whole changedHeader() function system of messages because all header changes now go through addHeader().
-* Specific header implementations can be created for complex headers. When a message creates a header, it uses a
-  HeaderFactory which can map specific headers to specific header classes. There is now a Link header and
-  CacheControl header implementation.
-* Removed from interface: Guzzle\Http\ClientInterface::setUriTemplate
-* Removed from interface: Guzzle\Http\ClientInterface::setCurlMulti()
-* Removed Guzzle\Http\Message\Request::receivedRequestHeader() and implemented this functionality in
-  Guzzle\Http\Curl\RequestMediator
-* Removed the optional $asString parameter from MessageInterface::getHeader(). Just cast the header to a string.
-* Removed the optional $tryChunkedTransfer option from Guzzle\Http\Message\EntityEnclosingRequestInterface
-* Removed the $asObjects argument from Guzzle\Http\Message\MessageInterface::getHeaders()
-* Removed Guzzle\Parser\ParserRegister::get(). Use getParser()
-* Removed Guzzle\Parser\ParserRegister::set(). Use registerParser().
-* All response header helper functions return a string rather than mixing Header objects and strings inconsistently
-* Removed cURL blacklist support. This is no longer necessary now that Expect, Accept, etc. are managed by Guzzle
-  directly via interfaces
-* Removed the injecting of a request object onto a response object. The methods to get and set a request still exist
-  but are a no-op until removed.
-* Most classes that used to require a `Guzzle\Service\Command\CommandInterface` typehint now request a
-  `Guzzle\Service\Command\ArrayCommandInterface`.
-* Added `Guzzle\Http\Message\RequestInterface::startResponse()` to the RequestInterface to handle injecting a response
-  on a request while the request is still being transferred
-* The ability to case-insensitively search for header values
-* Guzzle\Http\Message\Header::hasExactHeader
-* Guzzle\Http\Message\Header::raw. Use getAll()
-* Deprecated cache control specific methods on Guzzle\Http\Message\AbstractMessage. Use the CacheControl header object
-  instead.
-* `Guzzle\Service\Command\CommandInterface` now extends from ToArrayInterface and ArrayAccess
-* Added the ability to cast Model objects to a string to view debug information.
-
-## 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
-* Bug: Better cleanup of one-time events across the board (when an event is meant to fire once, it will now remove
-  itself from the EventDispatcher)
-* Bug: `Guzzle\Log\MessageFormatter` now properly writes "total_time" and "connect_time" values
-* Bug: Cloning an EntityEnclosingRequest now clones the EntityBody too
-* Bug: Fixed an undefined index error when parsing nested JSON responses with a sentAs parameter that reference a
-  non-existent key
-* Bug: All __call() method arguments are now required (helps with mocking frameworks)
-* Deprecating Response::getRequest() and now using a shallow clone of a request object to remove a circular reference
-  to help with refcount based garbage collection of resources created by sending a request
-* Deprecating ZF1 cache and log adapters. These will be removed in the next major version.
-* Deprecating `Response::getPreviousResponse()` (method signature still exists, but it's deprecated). Use the
-  HistoryPlugin for a history.
-* Added a `responseBody` alias for the `response_body` location
-* Refactored internals to no longer rely on Response::getRequest()
-* HistoryPlugin can now be cast to a string
-* HistoryPlugin now logs transactions rather than requests and responses to more accurately keep track of the requests
-  and responses that are sent over the wire
-* Added `getEffectiveUrl()` and `getRedirectCount()` to Response objects
-
-## 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
-
-## 3.4.2 - 2013-04-29
-
-* Bug fix: Stream objects now work correctly with "a" and "a+" modes
-* Bug fix: Removing `Transfer-Encoding: chunked` header when a Content-Length is present
-* Bug fix: AsyncPlugin no longer forces HEAD requests
-* Bug fix: DateTime timezones are now properly handled when using the service description schema formatter
-* Bug fix: CachePlugin now properly handles stale-if-error directives when a request to the origin server fails
-* Setting a response on a request will write to the custom request body from the response body if one is specified
-* LogPlugin now writes to php://output when STDERR is undefined
-* Added the ability to set multiple POST files for the same key in a single call
-* application/x-www-form-urlencoded POSTs now use the utf-8 charset by default
-* Added the ability to queue CurlExceptions to the MockPlugin
-* Cleaned up how manual responses are queued on requests (removed "queued_response" and now using request.before_send)
-* Configuration loading now allows remote files
-
-## 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
-  handles. This greatly simplifies the implementation, fixes a couple bugs, and provides a small performance boost.
-* Exceptions are now properly grouped when sending requests in parallel
-* Redirects are now properly aggregated when a multi transaction fails
-* Redirects now set the response on the original object even in the event of a failure
-* Bug fix: Model names are now properly set even when using $refs
-* Added support for PHP 5.5's CurlFile to prevent warnings with the deprecated @ syntax
-* Added support for oauth_callback in OAuth signatures
-* Added support for oauth_verifier in OAuth signatures
-* Added support to attempt to retrieve a command first literally, then ucfirst, the with inflection
-
-## 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
-* Bug fix: Absolute URLs with a path in a service description will now properly override the base URL. #289
-* Bug fix: Parsing a query string with a single PHP array value will now result in an array. #263
-* Bug fix: Better normalization of the User-Agent header to prevent duplicate headers. #264.
-* Bug fix: Added `number` type to service descriptions.
-* Bug fix: empty parameters are removed from an OAuth signature
-* Bug fix: Revalidating a cache entry prefers the Last-Modified over the Date header
-* Bug fix: Fixed "array to string" error when validating a union of types in a service description
-* Bug fix: Removed code that attempted to determine the size of a stream when data is written to the stream
-* Bug fix: Not including an `oauth_token` if the value is null in the OauthPlugin.
-* Bug fix: Now correctly aggregating successful requests and failed requests in CurlMulti when a redirect occurs.
-* The new default CURLOPT_TIMEOUT setting has been increased to 150 seconds so that Guzzle works on poor connections.
-* Added a feature to EntityEnclosingRequest::setBody() that will automatically set the Content-Type of the request if
-  the Content-Type can be determined based on the entity body or the path of the request.
-* Added the ability to overwrite configuration settings in a client when grabbing a throwaway client from a builder.
-* Added support for a PSR-3 LogAdapter.
-* Added a `command.after_prepare` event
-* Added `oauth_callback` parameter to the OauthPlugin
-* Added the ability to create a custom stream class when using a stream factory
-* Added a CachingEntityBody decorator
-* Added support for `additionalParameters` in service descriptions to define how custom parameters are serialized.
-* The bundled SSL certificate is now provided in the phar file and extracted when running Guzzle from a phar.
-* You can now send any EntityEnclosingRequest with POST fields or POST files and cURL will handle creating bodies
-* POST requests using a custom entity body are now treated exactly like PUT requests but with a custom cURL method. This
-  means that the redirect behavior of POST requests with custom bodies will not be the same as POST requests that use
-  POST fields or files (the latter is only used when emulating a form POST in the browser).
-* Lots of cleanup to CurlHandle::factory and RequestFactory::createRequest
-
-## 3.3.1 - 2013-03-10
-
-* Added the ability to create PHP streaming responses from HTTP requests
-* Bug fix: Running any filters when parsing response headers with service descriptions
-* Bug fix: OauthPlugin fixes to allow for multi-dimensional array signing, and sorting parameters before signing
-* Bug fix: Removed the adding of default empty arrays and false Booleans to responses in order to be consistent across
-  response location visitors.
-* Bug fix: Removed the possibility of creating configuration files with circular dependencies
-* RequestFactory::create() now uses the key of a POST file when setting the POST file name
-* Added xmlAllowEmpty to serialize an XML body even if no XML specific parameters are set
-
-## 3.3.0 - 2013-03-03
-
-* A large number of performance optimizations have been made
-* Bug fix: Added 'wb' as a valid write mode for streams
-* Bug fix: `Guzzle\Http\Message\Response::json()` now allows scalar values to be returned
-* Bug fix: Fixed bug in `Guzzle\Http\Message\Response` where wrapping quotes were stripped from `getEtag()`
-* BC: Removed `Guzzle\Http\Utils` class
-* BC: Setting a service description on a client will no longer modify the client's command factories.
-* BC: Emitting IO events from a RequestMediator is now a parameter that must be set in a request's curl options using
-  the 'emit_io' key. This was previously set under a request's parameters using 'curl.emit_io'
-* BC: `Guzzle\Stream\Stream::getWrapper()` and `Guzzle\Stream\Stream::getSteamType()` are no longer converted to
-  lowercase
-* Operation parameter objects are now lazy loaded internally
-* Added ErrorResponsePlugin that can throw errors for responses defined in service description operations' errorResponses
-* Added support for instantiating responseType=class responseClass classes. Classes must implement
-  `Guzzle\Service\Command\ResponseClassInterface`
-* Added support for additionalProperties for top-level parameters in responseType=model responseClasses. These
-  additional properties also support locations and can be used to parse JSON responses where the outermost part of the
-  JSON is an array
-* Added support for nested renaming of JSON models (rename sentAs to name)
-* CachePlugin
-    * Added support for stale-if-error so that the CachePlugin can now serve stale content from the cache on error
-    * Debug headers can now added to cached response in the CachePlugin
-
-## 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.
-* URLs with no path no longer contain a "/" by default
-* Guzzle\Http\QueryString does no longer manages the leading "?". This is now handled in Guzzle\Http\Url.
-* BadResponseException no longer includes the full request and response message
-* Adding setData() to Guzzle\Service\Description\ServiceDescriptionInterface
-* Adding getResponseBody() to Guzzle\Http\Message\RequestInterface
-* Various updates to classes to use ServiceDescriptionInterface type hints rather than ServiceDescription
-* Header values can now be normalized into distinct values when multiple headers are combined with a comma separated list
-* xmlEncoding can now be customized for the XML declaration of a XML service description operation
-* Guzzle\Http\QueryString now uses Guzzle\Http\QueryAggregator\QueryAggregatorInterface objects to add custom value
-  aggregation and no longer uses callbacks
-* The URL encoding implementation of Guzzle\Http\QueryString can now be customized
-* Bug fix: Filters were not always invoked for array service description parameters
-* Bug fix: Redirects now use a target response body rather than a temporary response body
-* Bug fix: The default exponential backoff BackoffPlugin was not giving when the request threshold was exceeded
-* Bug fix: Guzzle now takes the first found value when grabbing Cache-Control directives
-
-## 3.1.2 - 2013-01-27
-
-* Refactored how operation responses are parsed. Visitors now include a before() method responsible for parsing the
-  response body. For example, the XmlVisitor now parses the XML response into an array in the before() method.
-* Fixed an issue where cURL would not automatically decompress responses when the Accept-Encoding header was sent
-* CURLOPT_SSL_VERIFYHOST is never set to 1 because it is deprecated (see 5e0ff2ef20f839e19d1eeb298f90ba3598784444)
-* Fixed a bug where redirect responses were not chained correctly using getPreviousResponse()
-* Setting default headers on a client after setting the user-agent will not erase the user-agent setting
-
-## 3.1.1 - 2013-01-20
-
-* Adding wildcard support to Guzzle\Common\Collection::getPath()
-* Adding alias support to ServiceBuilder configs
-* Adding Guzzle\Service\Resource\CompositeResourceIteratorFactory and cleaning up factory interface
-
-## 3.1.0 - 2013-01-12
-
-* BC: CurlException now extends from RequestException rather than BadResponseException
-* BC: Renamed Guzzle\Plugin\Cache\CanCacheStrategyInterface::canCache() to canCacheRequest() and added CanCacheResponse()
-* Added getData to ServiceDescriptionInterface
-* Added context array to RequestInterface::setState()
-* Bug: Removing hard dependency on the BackoffPlugin from Guzzle\Http
-* Bug: Adding required content-type when JSON request visitor adds JSON to a command
-* Bug: Fixing the serialization of a service description with custom data
-* Made it easier to deal with exceptions thrown when transferring commands or requests in parallel by providing
-  an array of successful and failed responses
-* Moved getPath from Guzzle\Service\Resource\Model to Guzzle\Common\Collection
-* Added Guzzle\Http\IoEmittingEntityBody
-* Moved command filtration from validators to location visitors
-* Added `extends` attributes to service description parameters
-* Added getModels to ServiceDescriptionInterface
-
-## 3.0.7 - 2012-12-19
-
-* Fixing phar detection when forcing a cacert to system if null or true
-* Allowing filename to be passed to `Guzzle\Http\Message\Request::setResponseBody()`
-* Cleaning up `Guzzle\Common\Collection::inject` method
-* Adding a response_body location to service descriptions
-
-## 3.0.6 - 2012-12-09
-
-* CurlMulti performance improvements
-* Adding setErrorResponses() to Operation
-* composer.json tweaks
-
-## 3.0.5 - 2012-11-18
-
-* Bug: Fixing an infinite recursion bug caused from revalidating with the CachePlugin
-* Bug: Response body can now be a string containing "0"
-* Bug: Using Guzzle inside of a phar uses system by default but now allows for a custom cacert
-* Bug: QueryString::fromString now properly parses query string parameters that contain equal signs
-* Added support for XML attributes in service description responses
-* DefaultRequestSerializer now supports array URI parameter values for URI template expansion
-* Added better mimetype guessing to requests and post files
-
-## 3.0.4 - 2012-11-11
-
-* Bug: Fixed a bug when adding multiple cookies to a request to use the correct glue value
-* Bug: Cookies can now be added that have a name, domain, or value set to "0"
-* Bug: Using the system cacert bundle when using the Phar
-* Added json and xml methods to Response to make it easier to parse JSON and XML response data into data structures
-* Enhanced cookie jar de-duplication
-* Added the ability to enable strict cookie jars that throw exceptions when invalid cookies are added
-* Added setStream to StreamInterface to actually make it possible to implement custom rewind behavior for entity bodies
-* Added the ability to create any sort of hash for a stream rather than just an MD5 hash
-
-## 3.0.3 - 2012-11-04
-
-* Implementing redirects in PHP rather than cURL
-* Added PECL URI template extension and using as default parser if available
-* Bug: Fixed Content-Length parsing of Response factory
-* Adding rewind() method to entity bodies and streams. Allows for custom rewinding of non-repeatable streams.
-* Adding ToArrayInterface throughout library
-* Fixing OauthPlugin to create unique nonce values per request
-
-## 3.0.2 - 2012-10-25
-
-* Magic methods are enabled by default on clients
-* Magic methods return the result of a command
-* Service clients no longer require a base_url option in the factory
-* Bug: Fixed an issue with URI templates where null template variables were being expanded
-
-## 3.0.1 - 2012-10-22
-
-* Models can now be used like regular collection objects by calling filter, map, etc.
-* Models no longer require a Parameter structure or initial data in the constructor
-* Added a custom AppendIterator to get around a PHP bug with the `\AppendIterator`
-
-## 3.0.0 - 2012-10-15
-
-* Rewrote service description format to be based on Swagger
-    * Now based on JSON schema
-    * Added nested input structures and nested response models
-    * Support for JSON and XML input and output models
-    * Renamed `commands` to `operations`
-    * Removed dot class notation
-    * Removed custom types
-* Broke the project into smaller top-level namespaces to be more component friendly
-* Removed support for XML configs and descriptions. Use arrays or JSON files.
-* Removed the Validation component and Inspector
-* Moved all cookie code to Guzzle\Plugin\Cookie
-* Magic methods on a Guzzle\Service\Client now return the command un-executed.
-* Calling getResult() or getResponse() on a command will lazily execute the command if needed.
-* Now shipping with cURL's CA certs and using it by default
-* Added previousResponse() method to response objects
-* No longer sending Accept and Accept-Encoding headers on every request
-* Only sending an Expect header by default when a payload is greater than 1MB
-* Added/moved client options:
-    * curl.blacklist to curl.option.blacklist
-    * Added ssl.certificate_authority
-* Added a Guzzle\Iterator component
-* Moved plugins from Guzzle\Http\Plugin to Guzzle\Plugin
-* Added a more robust backoff retry strategy (replaced the ExponentialBackoffPlugin)
-* Added a more robust caching plugin
-* Added setBody to response objects
-* Updating LogPlugin to use a more flexible MessageFormatter
-* Added a completely revamped build process
-* Cleaning up Collection class and removing default values from the get method
-* Fixed ZF2 cache adapters
-
-## 2.8.8 - 2012-10-15
-
-* Bug: Fixed a cookie issue that caused dot prefixed domains to not match where popular browsers did
-
-## 2.8.7 - 2012-09-30
-
-* Bug: Fixed config file aliases for JSON includes
-* Bug: Fixed cookie bug on a request object by using CookieParser to parse cookies on requests
-* Bug: Removing the path to a file when sending a Content-Disposition header on a POST upload
-* Bug: Hardening request and response parsing to account for missing parts
-* Bug: Fixed PEAR packaging
-* Bug: Fixed Request::getInfo
-* Bug: Fixed cases where CURLM_CALL_MULTI_PERFORM return codes were causing curl transactions to fail
-* Adding the ability for the namespace Iterator factory to look in multiple directories
-* Added more getters/setters/removers from service descriptions
-* Added the ability to remove POST fields from OAuth signatures
-* OAuth plugin now supports 2-legged OAuth
-
-## 2.8.6 - 2012-09-05
-
-* Added the ability to modify and build service descriptions
-* Added the use of visitors to apply parameters to locations in service descriptions using the dynamic command
-* Added a `json` parameter location
-* Now allowing dot notation for classes in the CacheAdapterFactory
-* Using the union of two arrays rather than an array_merge when extending service builder services and service params
-* Ensuring that a service is a string before doing strpos() checks on it when substituting services for references
-  in service builder config files.
-* Services defined in two different config files that include one another will by default replace the previously
-  defined service, but you can now create services that extend themselves and merge their settings over the previous
-* The JsonLoader now supports aliasing filenames with different filenames. This allows you to alias something like
-  '_default' with a default JSON configuration file.
-
-## 2.8.5 - 2012-08-29
-
-* Bug: Suppressed empty arrays from URI templates
-* Bug: Added the missing $options argument from ServiceDescription::factory to enable caching
-* Added support for HTTP responses that do not contain a reason phrase in the start-line
-* AbstractCommand commands are now invokable
-* Added a way to get the data used when signing an Oauth request before a request is sent
-
-## 2.8.4 - 2012-08-15
-
-* Bug: Custom delay time calculations are no longer ignored in the ExponentialBackoffPlugin
-* Added the ability to transfer entity bodies as a string rather than streamed. This gets around curl error 65. Set `body_as_string` in a request's curl options to enable.
-* Added a StreamInterface, EntityBodyInterface, and added ftell() to Guzzle\Common\Stream
-* Added an AbstractEntityBodyDecorator and a ReadLimitEntityBody decorator to transfer only a subset of a decorated stream
-* Stream and EntityBody objects will now return the file position to the previous position after a read required operation (e.g. getContentMd5())
-* Added additional response status codes
-* Removed SSL information from the default User-Agent header
-* DELETE requests can now send an entity body
-* Added an EventDispatcher to the ExponentialBackoffPlugin and added an ExponentialBackoffLogger to log backoff retries
-* Added the ability of the MockPlugin to consume mocked request bodies
-* LogPlugin now exposes request and response objects in the extras array
-
-## 2.8.3 - 2012-07-30
-
-* Bug: Fixed a case where empty POST requests were sent as GET requests
-* Bug: Fixed a bug in ExponentialBackoffPlugin that caused fatal errors when retrying an EntityEnclosingRequest that does not have a body
-* Bug: Setting the response body of a request to null after completing a request, not when setting the state of a request to new
-* Added multiple inheritance to service description commands
-* Added an ApiCommandInterface and added `getParamNames()` and `hasParam()`
-* Removed the default 2mb size cutoff from the Md5ValidatorPlugin so that it now defaults to validating everything
-* Changed CurlMulti::perform to pass a smaller timeout to CurlMulti::executeHandles
-
-## 2.8.2 - 2012-07-24
-
-* Bug: Query string values set to 0 are no longer dropped from the query string
-* Bug: A Collection object is no longer created each time a call is made to `Guzzle\Service\Command\AbstractCommand::getRequestHeaders()`
-* Bug: `+` is now treated as an encoded space when parsing query strings
-* QueryString and Collection performance improvements
-* Allowing dot notation for class paths in filters attribute of a service descriptions
-
-## 2.8.1 - 2012-07-16
-
-* Loosening Event Dispatcher dependency
-* POST redirects can now be customized using CURLOPT_POSTREDIR
-
-## 2.8.0 - 2012-07-15
-
-* BC: Guzzle\Http\Query
-    * Query strings with empty variables will always show an equal sign unless the variable is set to QueryString::BLANK (e.g. ?acl= vs ?acl)
-    * Changed isEncodingValues() and isEncodingFields() to isUrlEncoding()
-    * Changed setEncodeValues(bool) and setEncodeFields(bool) to useUrlEncoding(bool)
-    * Changed the aggregation functions of QueryString to be static methods
-    * Can now use fromString() with querystrings that have a leading ?
-* cURL configuration values can be specified in service descriptions using `curl.` prefixed parameters
-* Content-Length is set to 0 before emitting the request.before_send event when sending an empty request body
-* Cookies are no longer URL decoded by default
-* Bug: URI template variables set to null are no longer expanded
-
-## 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.
-* BC: Removing Guzzle\Common\Batch\Batch::count() and replacing it with isEmpty()
-* CachePlugin now allows for a custom request parameter function to check if a request can be cached
-* Bug fix: CachePlugin now only caches GET and HEAD requests by default
-* Bug fix: Using header glue when transferring headers over the wire
-* Allowing deeply nested arrays for composite variables in URI templates
-* Batch divisors can now return iterators or arrays
-
-## 2.7.1 - 2012-06-26
-
-* Minor patch to update version number in UA string
-* Updating build process
-
-## 2.7.0 - 2012-06-25
-
-* BC: Inflection classes moved to Guzzle\Inflection. No longer static methods. Can now inject custom inflectors into classes.
-* BC: Removed magic setX methods from commands
-* BC: Magic methods mapped to service description commands are now inflected in the command factory rather than the client __call() method
-* Verbose cURL options are no longer enabled by default. Set curl.debug to true on a client to enable.
-* Bug: Now allowing colons in a response start-line (e.g. HTTP/1.1 503 Service Unavailable: Back-end server is at capacity)
-* Guzzle\Service\Resource\ResourceIteratorApplyBatched now internally uses the Guzzle\Common\Batch namespace
-* Added Guzzle\Service\Plugin namespace and a PluginCollectionPlugin
-* Added the ability to set POST fields and files in a service description
-* Guzzle\Http\EntityBody::factory() now accepts objects with a __toString() method
-* Adding a command.before_prepare event to clients
-* Added BatchClosureTransfer and BatchClosureDivisor
-* BatchTransferException now includes references to the batch divisor and transfer strategies
-* Fixed some tests so that they pass more reliably
-* Added Guzzle\Common\Log\ArrayLogAdapter
-
-## 2.6.6 - 2012-06-10
-
-* BC: Removing Guzzle\Http\Plugin\BatchQueuePlugin
-* BC: Removing Guzzle\Service\Command\CommandSet
-* Adding generic batching system (replaces the batch queue plugin and command set)
-* Updating ZF cache and log adapters and now using ZF's composer repository
-* Bug: Setting the name of each ApiParam when creating through an ApiCommand
-* Adding result_type, result_doc, deprecated, and doc_url to service descriptions
-* Bug: Changed the default cookie header casing back to 'Cookie'
-
-## 2.6.5 - 2012-06-03
-
-* BC: Renaming Guzzle\Http\Message\RequestInterface::getResourceUri() to getResource()
-* BC: Removing unused AUTH_BASIC and AUTH_DIGEST constants from
-* BC: Guzzle\Http\Cookie is now used to manage Set-Cookie data, not Cookie data
-* BC: Renaming methods in the CookieJarInterface
-* Moving almost all cookie logic out of the CookiePlugin and into the Cookie or CookieJar implementations
-* Making the default glue for HTTP headers ';' instead of ','
-* Adding a removeValue to Guzzle\Http\Message\Header
-* Adding getCookies() to request interface.
-* Making it easier to add event subscribers to HasDispatcherInterface classes. Can now directly call addSubscriber()
-
-## 2.6.4 - 2012-05-30
-
-* BC: Cleaning up how POST files are stored in EntityEnclosingRequest objects. Adding PostFile class.
-* BC: Moving ApiCommand specific functionality from the Inspector and on to the ApiCommand
-* Bug: Fixing magic method command calls on clients
-* Bug: Email constraint only validates strings
-* Bug: Aggregate POST fields when POST files are present in curl handle
-* Bug: Fixing default User-Agent header
-* Bug: Only appending or prepending parameters in commands if they are specified
-* Bug: Not requiring response reason phrases or status codes to match a predefined list of codes
-* Allowing the use of dot notation for class namespaces when using instance_of constraint
-* Added any_match validation constraint
-* Added an AsyncPlugin
-* Passing request object to the calculateWait method of the ExponentialBackoffPlugin
-* Allowing the result of a command object to be changed
-* Parsing location and type sub values when instantiating a service description rather than over and over at runtime
-
-## 2.6.3 - 2012-05-23
-
-* [BC] Guzzle\Common\FromConfigInterface no longer requires any config options.
-* [BC] Refactoring how POST files are stored on an EntityEnclosingRequest. They are now separate from POST fields.
-* You can now use an array of data when creating PUT request bodies in the request factory.
-* Removing the requirement that HTTPS requests needed a Cache-Control: public directive to be cacheable.
-* [Http] Adding support for Content-Type in multipart POST uploads per upload
-* [Http] Added support for uploading multiple files using the same name (foo[0], foo[1])
-* Adding more POST data operations for easier manipulation of POST data.
-* You can now set empty POST fields.
-* The body of a request is only shown on EntityEnclosingRequest objects that do not use POST files.
-* Split the Guzzle\Service\Inspector::validateConfig method into two methods. One to initialize when a command is created, and one to validate.
-* CS updates
-
-## 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.
-
-## 2.6.1 - 2012-05-19
-
-* [BC] Removing 'path' support in service descriptions.  Use 'uri'.
-* [BC] Guzzle\Service\Inspector::parseDocBlock is now protected. Adding getApiParamsForClass() with cache.
-* [BC] Removing Guzzle\Common\NullObject.  Use https://github.com/mtdowling/NullObject if you need it.
-* [BC] Removing Guzzle\Common\XmlElement.
-* All commands, both dynamic and concrete, have ApiCommand objects.
-* Adding a fix for CurlMulti so that if all of the connections encounter some sort of curl error, then the loop exits.
-* Adding checks to EntityEnclosingRequest so that empty POST files and fields are ignored.
-* Making the method signature of Guzzle\Service\Builder\ServiceBuilder::factory more flexible.
-
-## 2.6.0 - 2012-05-15
-
-* [BC] Moving Guzzle\Service\Builder to Guzzle\Service\Builder\ServiceBuilder
-* [BC] Executing a Command returns the result of the command rather than the command
-* [BC] Moving all HTTP parsing logic to Guzzle\Http\Parsers. Allows for faster C implementations if needed.
-* [BC] Changing the Guzzle\Http\Message\Response::setProtocol() method to accept a protocol and version in separate args.
-* [BC] Moving ResourceIterator* to Guzzle\Service\Resource
-* [BC] Completely refactored ResourceIterators to iterate over a cloned command object
-* [BC] Moved Guzzle\Http\UriTemplate to Guzzle\Http\Parser\UriTemplate\UriTemplate
-* [BC] Guzzle\Guzzle is now deprecated
-* Moving Guzzle\Common\Guzzle::inject to Guzzle\Common\Collection::inject
-* Adding Guzzle\Version class to give version information about Guzzle
-* Adding Guzzle\Http\Utils class to provide getDefaultUserAgent() and getHttpDate()
-* Adding Guzzle\Curl\CurlVersion to manage caching curl_version() data
-* ServiceDescription and ServiceBuilder are now cacheable using similar configs
-* Changing the format of XML and JSON service builder configs.  Backwards compatible.
-* Cleaned up Cookie parsing
-* Trimming the default Guzzle User-Agent header
-* Adding a setOnComplete() method to Commands that is called when a command completes
-* Keeping track of requests that were mocked in the MockPlugin
-* Fixed a caching bug in the CacheAdapterFactory
-* Inspector objects can be injected into a Command object
-* Refactoring a lot of code and tests to be case insensitive when dealing with headers
-* Adding Guzzle\Http\Message\HeaderComparison for easy comparison of HTTP headers using a DSL
-* Adding the ability to set global option overrides to service builder configs
-* Adding the ability to include other service builder config files from within XML and JSON files
-* Moving the parseQuery method out of Url and on to QueryString::fromString() as a static factory method.
-
-## 2.5.0 - 2012-05-08
-
-* Major performance improvements
-* [BC] Simplifying Guzzle\Common\Collection.  Please check to see if you are using features that are now deprecated.
-* [BC] Using a custom validation system that allows a flyweight implementation for much faster validation. No longer using Symfony2 Validation component.
-* [BC] No longer supporting "{{ }}" for injecting into command or UriTemplates.  Use "{}"
-* Added the ability to passed parameters to all requests created by a client
-* Added callback functionality to the ExponentialBackoffPlugin
-* Using microtime in ExponentialBackoffPlugin to allow more granular backoff strategies.
-* Rewinding request stream bodies when retrying requests
-* Exception is thrown when JSON response body cannot be decoded
-* Added configurable magic method calls to clients and commands.  This is off by default.
-* Fixed a defect that added a hash to every parsed URL part
-* Fixed duplicate none generation for OauthPlugin.
-* Emitting an event each time a client is generated by a ServiceBuilder
-* Using an ApiParams object instead of a Collection for parameters of an ApiCommand
-* cache.* request parameters should be renamed to params.cache.*
-* Added the ability to set arbitrary curl options on requests (disable_wire, progress, etc.). See CurlHandle.
-* Added the ability to disable type validation of service descriptions
-* ServiceDescriptions and ServiceBuilders are now Serializable
+# Change Log
+
+Please refer to [UPGRADING](UPGRADING.md) guide for upgrading to a major version.
+
+## 7.4.1 - 2021-12-06
+
+### Changed
+
+- Replaced implicit URI to string coercion [#2946](https://github.com/guzzle/guzzle/pull/2946)
+- Allow `symfony/deprecation-contracts` version 3 [#2961](https://github.com/guzzle/guzzle/pull/2961)
+
+### Fixed
+
+- Only close curl handle if it's done [#2950](https://github.com/guzzle/guzzle/pull/2950)
+
+## 7.4.0 - 2021-10-18
+
+### Added
+
+- Support PHP 8.1 [#2929](https://github.com/guzzle/guzzle/pull/2929), [#2939](https://github.com/guzzle/guzzle/pull/2939)
+- Support `psr/log` version 2 and 3 [#2943](https://github.com/guzzle/guzzle/pull/2943)
+
+### Fixed
+
+- Make sure we always call `restore_error_handler()` [#2915](https://github.com/guzzle/guzzle/pull/2915)
+- Fix progress parameter type compatibility between the cURL and stream handlers [#2936](https://github.com/guzzle/guzzle/pull/2936)
+- Throw `InvalidArgumentException` when an incorrect `headers` array is provided [#2916](https://github.com/guzzle/guzzle/pull/2916), [#2942](https://github.com/guzzle/guzzle/pull/2942)
+
+### Changed
+
+- Be more strict with types [#2914](https://github.com/guzzle/guzzle/pull/2914), [#2917](https://github.com/guzzle/guzzle/pull/2917), [#2919](https://github.com/guzzle/guzzle/pull/2919), [#2945](https://github.com/guzzle/guzzle/pull/2945)
+
+## 7.3.0 - 2021-03-23
+
+### Added
+
+- Support for DER and P12 certificates [#2413](https://github.com/guzzle/guzzle/pull/2413)
+- Support the cURL (http://) scheme for StreamHandler proxies [#2850](https://github.com/guzzle/guzzle/pull/2850)
+- Support for `guzzlehttp/psr7:^2.0` [#2878](https://github.com/guzzle/guzzle/pull/2878)
+
+### Fixed
+
+- Handle exceptions on invalid header consistently between PHP versions and handlers [#2872](https://github.com/guzzle/guzzle/pull/2872)
+
+## 7.2.0 - 2020-10-10
+
+### Added
+
+- Support for PHP 8 [#2712](https://github.com/guzzle/guzzle/pull/2712), [#2715](https://github.com/guzzle/guzzle/pull/2715), [#2789](https://github.com/guzzle/guzzle/pull/2789)
+- Support passing a body summarizer to the http errors middleware [#2795](https://github.com/guzzle/guzzle/pull/2795)
+
+### Fixed
+
+- Handle exceptions during response creation [#2591](https://github.com/guzzle/guzzle/pull/2591)
+- Fix CURLOPT_ENCODING not to be overwritten [#2595](https://github.com/guzzle/guzzle/pull/2595)
+- Make sure the Request always has a body object [#2804](https://github.com/guzzle/guzzle/pull/2804)
+
+### Changed
+
+- The `TooManyRedirectsException` has a response [#2660](https://github.com/guzzle/guzzle/pull/2660)
+- Avoid "functions" from dependencies [#2712](https://github.com/guzzle/guzzle/pull/2712)
+
+### Deprecated
+
+- Using environment variable GUZZLE_CURL_SELECT_TIMEOUT [#2786](https://github.com/guzzle/guzzle/pull/2786)
+
+## 7.1.1 - 2020-09-30
+
+### Fixed
+
+- Incorrect EOF detection for response body streams on Windows.
+
+### Changed
+
+- We dont connect curl `sink` on HEAD requests.
+- Removed some PHP 5 workarounds
+
+## 7.1.0 - 2020-09-22
+
+### Added
+
+- `GuzzleHttp\MessageFormatterInterface`
+
+### Fixed
+
+- Fixed issue that caused cookies with no value not to be stored.
+- On redirects, we allow all safe methods like GET, HEAD and OPTIONS.
+- Fixed logging on empty responses.
+- Make sure MessageFormatter::format returns string
+
+### Deprecated
+
+- All functions in `GuzzleHttp` has been deprecated. Use static methods on `Utils` instead.
+- `ClientInterface::getConfig()`
+- `Client::getConfig()`
+- `Client::__call()`
+- `Utils::defaultCaBundle()`
+- `CurlFactory::LOW_CURL_VERSION_NUMBER`
+
+## 7.0.1 - 2020-06-27
+
+* Fix multiply defined functions fatal error [#2699](https://github.com/guzzle/guzzle/pull/2699)
+
+## 7.0.0 - 2020-06-27
+
+No changes since 7.0.0-rc1.
+
+## 7.0.0-rc1 - 2020-06-15
+
+### Changed
+
+* Use error level for logging errors in Middleware [#2629](https://github.com/guzzle/guzzle/pull/2629)
+* Disabled IDN support by default and require ext-intl to use it [#2675](https://github.com/guzzle/guzzle/pull/2675)
+
+## 7.0.0-beta2 - 2020-05-25
+
+### Added
+
+* Using `Utils` class instead of functions in the `GuzzleHttp` namespace. [#2546](https://github.com/guzzle/guzzle/pull/2546)
+* `ClientInterface::MAJOR_VERSION` [#2583](https://github.com/guzzle/guzzle/pull/2583)
+
+### Changed
+
+* Avoid the `getenv` function when unsafe [#2531](https://github.com/guzzle/guzzle/pull/2531)
+* Added real client methods [#2529](https://github.com/guzzle/guzzle/pull/2529)
+* Avoid functions due to global install conflicts [#2546](https://github.com/guzzle/guzzle/pull/2546)
+* Use Symfony intl-idn polyfill [#2550](https://github.com/guzzle/guzzle/pull/2550)
+* Adding methods for HTTP verbs like `Client::get()`, `Client::head()`, `Client::patch()` etc [#2529](https://github.com/guzzle/guzzle/pull/2529)
+* `ConnectException` extends `TransferException` [#2541](https://github.com/guzzle/guzzle/pull/2541)
+* Updated the default User Agent to "GuzzleHttp/7" [#2654](https://github.com/guzzle/guzzle/pull/2654)
+
+### Fixed
+
+* Various intl icu issues [#2626](https://github.com/guzzle/guzzle/pull/2626)
+
+### Removed
+
+* Pool option `pool_size` [#2528](https://github.com/guzzle/guzzle/pull/2528)
+
+## 7.0.0-beta1 - 2019-12-30
+
+The diff might look very big but 95% of Guzzle users will be able to upgrade without modification.
+Please see [the upgrade document](UPGRADING.md) that describes all BC breaking changes.
+
+### Added
+
+* Implement PSR-18 and dropped PHP 5 support [#2421](https://github.com/guzzle/guzzle/pull/2421) [#2474](https://github.com/guzzle/guzzle/pull/2474)
+* PHP 7 types [#2442](https://github.com/guzzle/guzzle/pull/2442) [#2449](https://github.com/guzzle/guzzle/pull/2449) [#2466](https://github.com/guzzle/guzzle/pull/2466) [#2497](https://github.com/guzzle/guzzle/pull/2497) [#2499](https://github.com/guzzle/guzzle/pull/2499)
+* IDN support for redirects [2424](https://github.com/guzzle/guzzle/pull/2424)
+
+### Changed
+
+* Dont allow passing null as third argument to `BadResponseException::__construct()` [#2427](https://github.com/guzzle/guzzle/pull/2427)
+* Use SAPI constant instead of method call [#2450](https://github.com/guzzle/guzzle/pull/2450)
+* Use native function invocation [#2444](https://github.com/guzzle/guzzle/pull/2444)
+* Better defaults for PHP installations with old ICU lib [2454](https://github.com/guzzle/guzzle/pull/2454)
+* Added visibility to all constants [#2462](https://github.com/guzzle/guzzle/pull/2462)
+* Dont allow passing `null` as URI to `Client::request()` and `Client::requestAsync()` [#2461](https://github.com/guzzle/guzzle/pull/2461)
+* Widen the exception argument to throwable [#2495](https://github.com/guzzle/guzzle/pull/2495)
+
+### Fixed
+
+* Logging when Promise rejected with a string [#2311](https://github.com/guzzle/guzzle/pull/2311)
+
+### Removed
+
+* Class `SeekException` [#2162](https://github.com/guzzle/guzzle/pull/2162)
+* `RequestException::getResponseBodySummary()` [#2425](https://github.com/guzzle/guzzle/pull/2425)
+* `CookieJar::getCookieValue()` [#2433](https://github.com/guzzle/guzzle/pull/2433)
+* `uri_template()` and `UriTemplate` [#2440](https://github.com/guzzle/guzzle/pull/2440)
+* Request options `save_to` and `exceptions` [#2464](https://github.com/guzzle/guzzle/pull/2464)
+
+## 6.5.2 - 2019-12-23
+
+* idn_to_ascii() fix for old PHP versions [#2489](https://github.com/guzzle/guzzle/pull/2489)
+
+## 6.5.1 - 2019-12-21
+
+* Better defaults for PHP installations with old ICU lib [#2454](https://github.com/guzzle/guzzle/pull/2454)
+* IDN support for redirects [#2424](https://github.com/guzzle/guzzle/pull/2424)
+
+## 6.5.0 - 2019-12-07
+
+* Improvement: Added support for reset internal queue in MockHandler. [#2143](https://github.com/guzzle/guzzle/pull/2143)
+* Improvement: Added support to pass arbitrary options to `curl_multi_init`. [#2287](https://github.com/guzzle/guzzle/pull/2287)
+* Fix: Gracefully handle passing `null` to the `header` option. [#2132](https://github.com/guzzle/guzzle/pull/2132)
+* Fix: `RetryMiddleware` did not do exponential delay between retires due unit mismatch. [#2132](https://github.com/guzzle/guzzle/pull/2132)
+* Fix: Prevent undefined offset when using array for ssl_key options. [#2348](https://github.com/guzzle/guzzle/pull/2348)
+* Deprecated `ClientInterface::VERSION`
+
+## 6.4.1 - 2019-10-23
+
+* No `guzzle.phar` was created in 6.4.0 due expired API token. This release will fix that
+* Added `parent::__construct()` to `FileCookieJar` and `SessionCookieJar`
+
+## 6.4.0 - 2019-10-23
+
+* Improvement: Improved error messages when using curl < 7.21.2 [#2108](https://github.com/guzzle/guzzle/pull/2108)
+* Fix: Test if response is readable before returning a summary in `RequestException::getResponseBodySummary()` [#2081](https://github.com/guzzle/guzzle/pull/2081)
+* Fix: Add support for GUZZLE_CURL_SELECT_TIMEOUT environment variable [#2161](https://github.com/guzzle/guzzle/pull/2161)
+* Improvement: Added `GuzzleHttp\Exception\InvalidArgumentException` [#2163](https://github.com/guzzle/guzzle/pull/2163)
+* Improvement: Added `GuzzleHttp\_current_time()` to use `hrtime()` if that function exists. [#2242](https://github.com/guzzle/guzzle/pull/2242)
+* Improvement: Added curl's `appconnect_time` in `TransferStats` [#2284](https://github.com/guzzle/guzzle/pull/2284)
+* Improvement: Make GuzzleException extend Throwable wherever it's available [#2273](https://github.com/guzzle/guzzle/pull/2273)
+* Fix: Prevent concurrent writes to file when saving `CookieJar` [#2335](https://github.com/guzzle/guzzle/pull/2335)
+* Improvement: Update `MockHandler` so we can test transfer time [#2362](https://github.com/guzzle/guzzle/pull/2362)
+
+## 6.3.3 - 2018-04-22
+
+* Fix: Default headers when decode_content is specified
+
+
+## 6.3.2 - 2018-03-26
+
+* Fix: Release process
+
+
+## 6.3.1 - 2018-03-26
+
+* Bug fix: Parsing 0 epoch expiry times in cookies [#2014](https://github.com/guzzle/guzzle/pull/2014)
+* Improvement: Better ConnectException detection [#2012](https://github.com/guzzle/guzzle/pull/2012)
+* Bug fix: Malformed domain that contains a "/" [#1999](https://github.com/guzzle/guzzle/pull/1999)
+* Bug fix: Undefined offset when a cookie has no first key-value pair [#1998](https://github.com/guzzle/guzzle/pull/1998)
+* Improvement: Support PHPUnit 6 [#1953](https://github.com/guzzle/guzzle/pull/1953)
+* Bug fix: Support empty headers [#1915](https://github.com/guzzle/guzzle/pull/1915)
+* Bug fix: Ignore case during header modifications [#1916](https://github.com/guzzle/guzzle/pull/1916)
+
++ Minor code cleanups, documentation fixes and clarifications.
+
+
+## 6.3.0 - 2017-06-22
+
+* Feature: force IP resolution (ipv4 or ipv6) [#1608](https://github.com/guzzle/guzzle/pull/1608), [#1659](https://github.com/guzzle/guzzle/pull/1659)
+* Improvement: Don't include summary in exception message when body is empty [#1621](https://github.com/guzzle/guzzle/pull/1621)
+* Improvement: Handle `on_headers` option in MockHandler [#1580](https://github.com/guzzle/guzzle/pull/1580)
+* Improvement: Added SUSE Linux CA path [#1609](https://github.com/guzzle/guzzle/issues/1609)
+* Improvement: Use class reference for getting the name of the class instead of using hardcoded strings [#1641](https://github.com/guzzle/guzzle/pull/1641)
+* Feature: Added `read_timeout` option [#1611](https://github.com/guzzle/guzzle/pull/1611)
+* Bug fix: PHP 7.x fixes [#1685](https://github.com/guzzle/guzzle/pull/1685), [#1686](https://github.com/guzzle/guzzle/pull/1686), [#1811](https://github.com/guzzle/guzzle/pull/1811)
+* Deprecation: BadResponseException instantiation without a response [#1642](https://github.com/guzzle/guzzle/pull/1642)
+* Feature: Added NTLM auth [#1569](https://github.com/guzzle/guzzle/pull/1569)
+* Feature: Track redirect HTTP status codes [#1711](https://github.com/guzzle/guzzle/pull/1711)
+* Improvement: Check handler type during construction [#1745](https://github.com/guzzle/guzzle/pull/1745)
+* Improvement: Always include the Content-Length if there's a body [#1721](https://github.com/guzzle/guzzle/pull/1721)
+* Feature: Added convenience method to access a cookie by name [#1318](https://github.com/guzzle/guzzle/pull/1318)
+* Bug fix: Fill `CURLOPT_CAPATH` and `CURLOPT_CAINFO` properly [#1684](https://github.com/guzzle/guzzle/pull/1684)
+* Improvement:  	Use `\GuzzleHttp\Promise\rejection_for` function instead of object init [#1827](https://github.com/guzzle/guzzle/pull/1827)
+
+
++ Minor code cleanups, documentation fixes and clarifications.
+
+## 6.2.3 - 2017-02-28
+
+* Fix deprecations with guzzle/psr7 version 1.4
+
+## 6.2.2 - 2016-10-08
+
+* Allow to pass nullable Response to delay callable
+* Only add scheme when host is present
+* Fix drain case where content-length is the literal string zero
+* Obfuscate in-URL credentials in exceptions
+
+## 6.2.1 - 2016-07-18
+
+* Address HTTP_PROXY security vulnerability, CVE-2016-5385:
+  https://httpoxy.org/
+* Fixing timeout bug with StreamHandler:
+  https://github.com/guzzle/guzzle/pull/1488
+* Only read up to `Content-Length` in PHP StreamHandler to avoid timeouts when
+  a server does not honor `Connection: close`.
+* Ignore URI fragment when sending requests.
+
+## 6.2.0 - 2016-03-21
+
+* Feature: added `GuzzleHttp\json_encode` and `GuzzleHttp\json_decode`.
+  https://github.com/guzzle/guzzle/pull/1389
+* Bug fix: Fix sleep calculation when waiting for delayed requests.
+  https://github.com/guzzle/guzzle/pull/1324
+* Feature: More flexible history containers.
+  https://github.com/guzzle/guzzle/pull/1373
+* Bug fix: defer sink stream opening in StreamHandler.
+  https://github.com/guzzle/guzzle/pull/1377
+* Bug fix: do not attempt to escape cookie values.
+  https://github.com/guzzle/guzzle/pull/1406
+* Feature: report original content encoding and length on decoded responses.
+  https://github.com/guzzle/guzzle/pull/1409
+* Bug fix: rewind seekable request bodies before dispatching to cURL.
+  https://github.com/guzzle/guzzle/pull/1422
+* Bug fix: provide an empty string to `http_build_query` for HHVM workaround.
+  https://github.com/guzzle/guzzle/pull/1367
+
+## 6.1.1 - 2015-11-22
+
+* Bug fix: Proxy::wrapSync() now correctly proxies to the appropriate handler
+  https://github.com/guzzle/guzzle/commit/911bcbc8b434adce64e223a6d1d14e9a8f63e4e4
+* Feature: HandlerStack is now more generic.
+  https://github.com/guzzle/guzzle/commit/f2102941331cda544745eedd97fc8fd46e1ee33e
+* Bug fix: setting verify to false in the StreamHandler now disables peer
+  verification. https://github.com/guzzle/guzzle/issues/1256
+* Feature: Middleware now uses an exception factory, including more error
+  context. https://github.com/guzzle/guzzle/pull/1282
+* Feature: better support for disabled functions.
+  https://github.com/guzzle/guzzle/pull/1287
+* Bug fix: fixed regression where MockHandler was not using `sink`.
+  https://github.com/guzzle/guzzle/pull/1292
+
+## 6.1.0 - 2015-09-08
+
+* Feature: Added the `on_stats` request option to provide access to transfer
+  statistics for requests. https://github.com/guzzle/guzzle/pull/1202
+* Feature: Added the ability to persist session cookies in CookieJars.
+  https://github.com/guzzle/guzzle/pull/1195
+* Feature: Some compatibility updates for Google APP Engine
+  https://github.com/guzzle/guzzle/pull/1216
+* Feature: Added support for NO_PROXY to prevent the use of a proxy based on
+  a simple set of rules. https://github.com/guzzle/guzzle/pull/1197
+* Feature: Cookies can now contain square brackets.
+  https://github.com/guzzle/guzzle/pull/1237
+* Bug fix: Now correctly parsing `=` inside of quotes in Cookies.
+  https://github.com/guzzle/guzzle/pull/1232
+* Bug fix: Cusotm cURL options now correctly override curl options of the
+  same name. https://github.com/guzzle/guzzle/pull/1221
+* Bug fix: Content-Type header is now added when using an explicitly provided
+  multipart body. https://github.com/guzzle/guzzle/pull/1218
+* Bug fix: Now ignoring Set-Cookie headers that have no name.
+* Bug fix: Reason phrase is no longer cast to an int in some cases in the
+  cURL handler. https://github.com/guzzle/guzzle/pull/1187
+* Bug fix: Remove the Authorization header when redirecting if the Host
+  header changes. https://github.com/guzzle/guzzle/pull/1207
+* Bug fix: Cookie path matching fixes
+  https://github.com/guzzle/guzzle/issues/1129
+* Bug fix: Fixing the cURL `body_as_string` setting
+  https://github.com/guzzle/guzzle/pull/1201
+* Bug fix: quotes are no longer stripped when parsing cookies.
+  https://github.com/guzzle/guzzle/issues/1172
+* Bug fix: `form_params` and `query` now always uses the `&` separator.
+  https://github.com/guzzle/guzzle/pull/1163
+* Bug fix: Adding a Content-Length to PHP stream wrapper requests if not set.
+  https://github.com/guzzle/guzzle/pull/1189
+
+## 6.0.2 - 2015-07-04
+
+* Fixed a memory leak in the curl handlers in which references to callbacks
+  were not being removed by `curl_reset`.
+* Cookies are now extracted properly before redirects.
+* Cookies now allow more character ranges.
+* Decoded Content-Encoding responses are now modified to correctly reflect
+  their state if the encoding was automatically removed by a handler. This
+  means that the `Content-Encoding` header may be removed an the
+  `Content-Length` modified to reflect the message size after removing the
+  encoding.
+* Added a more explicit error message when trying to use `form_params` and
+  `multipart` in the same request.
+* Several fixes for HHVM support.
+* Functions are now conditionally required using an additional level of
+  indirection to help with global Composer installations.
+
+## 6.0.1 - 2015-05-27
+
+* Fixed a bug with serializing the `query` request option where the `&`
+  separator was missing.
+* Added a better error message for when `body` is provided as an array. Please
+  use `form_params` or `multipart` instead.
+* Various doc fixes.
+
+## 6.0.0 - 2015-05-26
+
+* See the UPGRADING.md document for more information.
+* Added `multipart` and `form_params` request options.
+* Added `synchronous` request option.
+* Added the `on_headers` request option.
+* Fixed `expect` handling.
+* No longer adding default middlewares in the client ctor. These need to be
+  present on the provided handler in order to work.
+* Requests are no longer initiated when sending async requests with the
+  CurlMultiHandler. This prevents unexpected recursion from requests completing
+  while ticking the cURL loop.
+* Removed the semantics of setting `default` to `true`. This is no longer
+  required now that the cURL loop is not ticked for async requests.
+* Added request and response logging middleware.
+* No longer allowing self signed certificates when using the StreamHandler.
+* Ensuring that `sink` is valid if saving to a file.
+* Request exceptions now include a "handler context" which provides handler
+  specific contextual information.
+* Added `GuzzleHttp\RequestOptions` to allow request options to be applied
+  using constants.
+* `$maxHandles` has been removed from CurlMultiHandler.
+* `MultipartPostBody` is now part of the `guzzlehttp/psr7` package.
+
+## 5.3.0 - 2015-05-19
+
+* Mock now supports `save_to`
+* Marked `AbstractRequestEvent::getTransaction()` as public.
+* Fixed a bug in which multiple headers using different casing would overwrite
+  previous headers in the associative array.
+* Added `Utils::getDefaultHandler()`
+* Marked `GuzzleHttp\Client::getDefaultUserAgent` as deprecated.
+* URL scheme is now always lowercased.
+
+## 6.0.0-beta.1
+
+* Requires PHP >= 5.5
+* Updated to use PSR-7
+  * Requires immutable messages, which basically means an event based system
+    owned by a request instance is no longer possible.
+  * Utilizing the [Guzzle PSR-7 package](https://github.com/guzzle/psr7).
+  * Removed the dependency on `guzzlehttp/streams`. These stream abstractions
+    are available in the `guzzlehttp/psr7` package under the `GuzzleHttp\Psr7`
+    namespace.
+* Added middleware and handler system
+  * Replaced the Guzzle event and subscriber system with a middleware system.
+  * No longer depends on RingPHP, but rather places the HTTP handlers directly
+    in Guzzle, operating on PSR-7 messages.
+  * Retry logic is now encapsulated in `GuzzleHttp\Middleware::retry`, which
+    means the `guzzlehttp/retry-subscriber` is now obsolete.
+  * Mocking responses is now handled using `GuzzleHttp\Handler\MockHandler`.
+* Asynchronous responses
+  * No longer supports the `future` request option to send an async request.
+    Instead, use one of the `*Async` methods of a client (e.g., `requestAsync`,
+    `getAsync`, etc.).
+  * Utilizing `GuzzleHttp\Promise` instead of React's promise library to avoid
+    recursion required by chaining and forwarding react promises. See
+    https://github.com/guzzle/promises
+  * Added `requestAsync` and `sendAsync` to send request asynchronously.
+  * Added magic methods for `getAsync()`, `postAsync()`, etc. to send requests
+    asynchronously.
+* Request options
+  * POST and form updates
+    * Added the `form_fields` and `form_files` request options.
+    * Removed the `GuzzleHttp\Post` namespace.
+    * The `body` request option no longer accepts an array for POST requests.
+  * The `exceptions` request option has been deprecated in favor of the
+    `http_errors` request options.
+  * The `save_to` request option has been deprecated in favor of `sink` request
+    option.
+* Clients no longer accept an array of URI template string and variables for
+  URI variables. You will need to expand URI templates before passing them
+  into a client constructor or request method.
+* Client methods `get()`, `post()`, `put()`, `patch()`, `options()`, etc. are
+  now magic methods that will send synchronous requests.
+* Replaced `Utils.php` with plain functions in `functions.php`.
+* Removed `GuzzleHttp\Collection`.
+* Removed `GuzzleHttp\BatchResults`. Batched pool results are now returned as
+  an array.
+* Removed `GuzzleHttp\Query`. Query string handling is now handled using an
+  associative array passed into the `query` request option. The query string
+  is serialized using PHP's `http_build_query`. If you need more control, you
+  can pass the query string in as a string.
+* `GuzzleHttp\QueryParser` has been replaced with the
+  `GuzzleHttp\Psr7\parse_query`.
+
+## 5.2.0 - 2015-01-27
+
+* Added `AppliesHeadersInterface` to make applying headers to a request based
+  on the body more generic and not specific to `PostBodyInterface`.
+* Reduced the number of stack frames needed to send requests.
+* Nested futures are now resolved in the client rather than the RequestFsm
+* Finishing state transitions is now handled in the RequestFsm rather than the
+  RingBridge.
+* Added a guard in the Pool class to not use recursion for request retries.
+
+## 5.1.0 - 2014-12-19
+
+* Pool class no longer uses recursion when a request is intercepted.
+* The size of a Pool can now be dynamically adjusted using a callback.
+  See https://github.com/guzzle/guzzle/pull/943.
+* Setting a request option to `null` when creating a request with a client will
+  ensure that the option is not set. This allows you to overwrite default
+  request options on a per-request basis.
+  See https://github.com/guzzle/guzzle/pull/937.
+* Added the ability to limit which protocols are allowed for redirects by
+  specifying a `protocols` array in the `allow_redirects` request option.
+* Nested futures due to retries are now resolved when waiting for synchronous
+  responses. See https://github.com/guzzle/guzzle/pull/947.
+* `"0"` is now an allowed URI path. See
+  https://github.com/guzzle/guzzle/pull/935.
+* `Query` no longer typehints on the `$query` argument in the constructor,
+  allowing for strings and arrays.
+* Exceptions thrown in the `end` event are now correctly wrapped with Guzzle
+  specific exceptions if necessary.
+
+## 5.0.3 - 2014-11-03
+
+This change updates query strings so that they are treated as un-encoded values
+by default where the value represents an un-encoded value to send over the
+wire. A Query object then encodes the value before sending over the wire. This
+means that even value query string values (e.g., ":") are url encoded. This
+makes the Query class match PHP's http_build_query function. However, if you
+want to send requests over the wire using valid query string characters that do
+not need to be encoded, then you can provide a string to Url::setQuery() and
+pass true as the second argument to specify that the query string is a raw
+string that should not be parsed or encoded (unless a call to getQuery() is
+subsequently made, forcing the query-string to be converted into a Query
+object).
+
+## 5.0.2 - 2014-10-30
+
+* Added a trailing `\r\n` to multipart/form-data payloads. See
+  https://github.com/guzzle/guzzle/pull/871
+* Added a `GuzzleHttp\Pool::send()` convenience method to match the docs.
+* Status codes are now returned as integers. See
+  https://github.com/guzzle/guzzle/issues/881
+* No longer overwriting an existing `application/x-www-form-urlencoded` header
+  when sending POST requests, allowing for customized headers. See
+  https://github.com/guzzle/guzzle/issues/877
+* Improved path URL serialization.
+
+  * No longer double percent-encoding characters in the path or query string if
+    they are already encoded.
+  * Now properly encoding the supplied path to a URL object, instead of only
+    encoding ' ' and '?'.
+  * Note: This has been changed in 5.0.3 to now encode query string values by
+    default unless the `rawString` argument is provided when setting the query
+    string on a URL: Now allowing many more characters to be present in the
+    query string without being percent encoded. See https://tools.ietf.org/html/rfc3986#appendix-A
+
+## 5.0.1 - 2014-10-16
+
+Bugfix release.
+
+* Fixed an issue where connection errors still returned response object in
+  error and end events event though the response is unusable. This has been
+  corrected so that a response is not returned in the `getResponse` method of
+  these events if the response did not complete. https://github.com/guzzle/guzzle/issues/867
+* Fixed an issue where transfer statistics were not being populated in the
+  RingBridge. https://github.com/guzzle/guzzle/issues/866
+
+## 5.0.0 - 2014-10-12
+
+Adding support for non-blocking responses and some minor API cleanup.
+
+### New Features
+
+* Added support for non-blocking responses based on `guzzlehttp/guzzle-ring`.
+* Added a public API for creating a default HTTP adapter.
+* Updated the redirect plugin to be non-blocking so that redirects are sent
+  concurrently. Other plugins like this can now be updated to be non-blocking.
+* Added a "progress" event so that you can get upload and download progress
+  events.
+* Added `GuzzleHttp\Pool` which implements FutureInterface and transfers
+  requests concurrently using a capped pool size as efficiently as possible.
+* Added `hasListeners()` to EmitterInterface.
+* Removed `GuzzleHttp\ClientInterface::sendAll` and marked
+  `GuzzleHttp\Client::sendAll` as deprecated (it's still there, just not the
+  recommended way).
+
+### Breaking changes
+
+The breaking changes in this release are relatively minor. The biggest thing to
+look out for is that request and response objects no longer implement fluent
+interfaces.
+
+* Removed the fluent interfaces (i.e., `return $this`) from requests,
+  responses, `GuzzleHttp\Collection`, `GuzzleHttp\Url`,
+  `GuzzleHttp\Query`, `GuzzleHttp\Post\PostBody`, and
+  `GuzzleHttp\Cookie\SetCookie`. This blog post provides a good outline of
+  why I did this: https://ocramius.github.io/blog/fluent-interfaces-are-evil/.
+  This also makes the Guzzle message interfaces compatible with the current
+  PSR-7 message proposal.
+* Removed "functions.php", so that Guzzle is truly PSR-4 compliant. Except
+  for the HTTP request functions from function.php, these functions are now
+  implemented in `GuzzleHttp\Utils` using camelCase. `GuzzleHttp\json_decode`
+  moved to `GuzzleHttp\Utils::jsonDecode`. `GuzzleHttp\get_path` moved to
+  `GuzzleHttp\Utils::getPath`. `GuzzleHttp\set_path` moved to
+  `GuzzleHttp\Utils::setPath`. `GuzzleHttp\batch` should now be
+  `GuzzleHttp\Pool::batch`, which returns an `objectStorage`. Using functions.php
+  caused problems for many users: they aren't PSR-4 compliant, require an
+  explicit include, and needed an if-guard to ensure that the functions are not
+  declared multiple times.
+* Rewrote adapter layer.
+    * Removing all classes from `GuzzleHttp\Adapter`, these are now
+      implemented as callables that are stored in `GuzzleHttp\Ring\Client`.
+    * Removed the concept of "parallel adapters". Sending requests serially or
+      concurrently is now handled using a single adapter.
+    * Moved `GuzzleHttp\Adapter\Transaction` to `GuzzleHttp\Transaction`. The
+      Transaction object now exposes the request, response, and client as public
+      properties. The getters and setters have been removed.
+* Removed the "headers" event. This event was only useful for changing the
+  body a response once the headers of the response were known. You can implement
+  a similar behavior in a number of ways. One example might be to use a
+  FnStream that has access to the transaction being sent. For example, when the
+  first byte is written, you could check if the response headers match your
+  expectations, and if so, change the actual stream body that is being
+  written to.
+* Removed the `asArray` parameter from
+  `GuzzleHttp\Message\MessageInterface::getHeader`. If you want to get a header
+  value as an array, then use the newly added `getHeaderAsArray()` method of
+  `MessageInterface`. This change makes the Guzzle interfaces compatible with
+  the PSR-7 interfaces.
+* `GuzzleHttp\Message\MessageFactory` no longer allows subclasses to add
+  custom request options using double-dispatch (this was an implementation
+  detail). Instead, you should now provide an associative array to the
+  constructor which is a mapping of the request option name mapping to a
+  function that applies the option value to a request.
+* Removed the concept of "throwImmediately" from exceptions and error events.
+  This control mechanism was used to stop a transfer of concurrent requests
+  from completing. This can now be handled by throwing the exception or by
+  cancelling a pool of requests or each outstanding future request individually.
+* Updated to "GuzzleHttp\Streams" 3.0.
+    * `GuzzleHttp\Stream\StreamInterface::getContents()` no longer accepts a
+      `maxLen` parameter. This update makes the Guzzle streams project
+      compatible with the current PSR-7 proposal.
+    * `GuzzleHttp\Stream\Stream::__construct`,
+      `GuzzleHttp\Stream\Stream::factory`, and
+      `GuzzleHttp\Stream\Utils::create` no longer accept a size in the second
+      argument. They now accept an associative array of options, including the
+      "size" key and "metadata" key which can be used to provide custom metadata.
+
+## 4.2.2 - 2014-09-08
+
+* Fixed a memory leak in the CurlAdapter when reusing cURL handles.
+* No longer using `request_fulluri` in stream adapter proxies.
+* Relative redirects are now based on the last response, not the first response.
+
+## 4.2.1 - 2014-08-19
+
+* Ensuring that the StreamAdapter does not always add a Content-Type header
+* Adding automated github releases with a phar and zip
+
+## 4.2.0 - 2014-08-17
+
+* Now merging in default options using a case-insensitive comparison.
+  Closes https://github.com/guzzle/guzzle/issues/767
+* Added the ability to automatically decode `Content-Encoding` response bodies
+  using the `decode_content` request option. This is set to `true` by default
+  to decode the response body if it comes over the wire with a
+  `Content-Encoding`. Set this value to `false` to disable decoding the
+  response content, and pass a string to provide a request `Accept-Encoding`
+  header and turn on automatic response decoding. This feature now allows you
+  to pass an `Accept-Encoding` header in the headers of a request but still
+  disable automatic response decoding.
+  Closes https://github.com/guzzle/guzzle/issues/764
+* Added the ability to throw an exception immediately when transferring
+  requests in parallel. Closes https://github.com/guzzle/guzzle/issues/760
+* Updating guzzlehttp/streams dependency to ~2.1
+* No longer utilizing the now deprecated namespaced methods from the stream
+  package.
+
+## 4.1.8 - 2014-08-14
+
+* Fixed an issue in the CurlFactory that caused setting the `stream=false`
+  request option to throw an exception.
+  See: https://github.com/guzzle/guzzle/issues/769
+* TransactionIterator now calls rewind on the inner iterator.
+  See: https://github.com/guzzle/guzzle/pull/765
+* You can now set the `Content-Type` header to `multipart/form-data`
+  when creating POST requests to force multipart bodies.
+  See https://github.com/guzzle/guzzle/issues/768
+
+## 4.1.7 - 2014-08-07
+
+* Fixed an error in the HistoryPlugin that caused the same request and response
+  to be logged multiple times when an HTTP protocol error occurs.
+* Ensuring that cURL does not add a default Content-Type when no Content-Type
+  has been supplied by the user. This prevents the adapter layer from modifying
+  the request that is sent over the wire after any listeners may have already
+  put the request in a desired state (e.g., signed the request).
+* Throwing an exception when you attempt to send requests that have the
+  "stream" set to true in parallel using the MultiAdapter.
+* Only calling curl_multi_select when there are active cURL handles. This was
+  previously changed and caused performance problems on some systems due to PHP
+  always selecting until the maximum select timeout.
+* Fixed a bug where multipart/form-data POST fields were not correctly
+  aggregated (e.g., values with "&").
+
+## 4.1.6 - 2014-08-03
+
+* Added helper methods to make it easier to represent messages as strings,
+  including getting the start line and getting headers as a string.
+
+## 4.1.5 - 2014-08-02
+
+* Automatically retrying cURL "Connection died, retrying a fresh connect"
+  errors when possible.
+* cURL implementation cleanup
+* Allowing multiple event subscriber listeners to be registered per event by
+  passing an array of arrays of listener configuration.
+
+## 4.1.4 - 2014-07-22
+
+* Fixed a bug that caused multi-part POST requests with more than one field to
+  serialize incorrectly.
+* Paths can now be set to "0"
+* `ResponseInterface::xml` now accepts a `libxml_options` option and added a
+  missing default argument that was required when parsing XML response bodies.
+* A `save_to` stream is now created lazily, which means that files are not
+  created on disk unless a request succeeds.
+
+## 4.1.3 - 2014-07-15
+
+* Various fixes to multipart/form-data POST uploads
+* Wrapping function.php in an if-statement to ensure Guzzle can be used
+  globally and in a Composer install
+* Fixed an issue with generating and merging in events to an event array
+* POST headers are only applied before sending a request to allow you to change
+  the query aggregator used before uploading
+* Added much more robust query string parsing
+* Fixed various parsing and normalization issues with URLs
+* Fixing an issue where multi-valued headers were not being utilized correctly
+  in the StreamAdapter
+
+## 4.1.2 - 2014-06-18
+
+* Added support for sending payloads with GET requests
+
+## 4.1.1 - 2014-06-08
+
+* Fixed an issue related to using custom message factory options in subclasses
+* Fixed an issue with nested form fields in a multi-part POST
+* Fixed an issue with using the `json` request option for POST requests
+* Added `ToArrayInterface` to `GuzzleHttp\Cookie\CookieJar`
+
+## 4.1.0 - 2014-05-27
+
+* Added a `json` request option to easily serialize JSON payloads.
+* Added a `GuzzleHttp\json_decode()` wrapper to safely parse JSON.
+* Added `setPort()` and `getPort()` to `GuzzleHttp\Message\RequestInterface`.
+* Added the ability to provide an emitter to a client in the client constructor.
+* Added the ability to persist a cookie session using $_SESSION.
+* Added a trait that can be used to add event listeners to an iterator.
+* Removed request method constants from RequestInterface.
+* Fixed warning when invalid request start-lines are received.
+* Updated MessageFactory to work with custom request option methods.
+* Updated cacert bundle to latest build.
+
+4.0.2 (2014-04-16)
+------------------
+
+* Proxy requests using the StreamAdapter now properly use request_fulluri (#632)
+* Added the ability to set scalars as POST fields (#628)
+
+## 4.0.1 - 2014-04-04
+
+* The HTTP status code of a response is now set as the exception code of
+  RequestException objects.
+* 303 redirects will now correctly switch from POST to GET requests.
+* The default parallel adapter of a client now correctly uses the MultiAdapter.
+* HasDataTrait now initializes the internal data array as an empty array so
+  that the toArray() method always returns an array.
+
+## 4.0.0 - 2014-03-29
+
+* For information on changes and upgrading, see:
+  https://github.com/guzzle/guzzle/blob/master/UPGRADING.md#3x-to-40
+* Added `GuzzleHttp\batch()` as a convenience function for sending requests in
+  parallel without needing to write asynchronous code.
+* Restructured how events are added to `GuzzleHttp\ClientInterface::sendAll()`.
+  You can now pass a callable or an array of associative arrays where each
+  associative array contains the "fn", "priority", and "once" keys.
+
+## 4.0.0.rc-2 - 2014-03-25
+
+* Removed `getConfig()` and `setConfig()` from clients to avoid confusion
+  around whether things like base_url, message_factory, etc. should be able to
+  be retrieved or modified.
+* Added `getDefaultOption()` and `setDefaultOption()` to ClientInterface
+* functions.php functions were renamed using snake_case to match PHP idioms
+* Added support for `HTTP_PROXY`, `HTTPS_PROXY`, and
+  `GUZZLE_CURL_SELECT_TIMEOUT` environment variables
+* Added the ability to specify custom `sendAll()` event priorities
+* Added the ability to specify custom stream context options to the stream
+  adapter.
+* Added a functions.php function for `get_path()` and `set_path()`
+* CurlAdapter and MultiAdapter now use a callable to generate curl resources
+* MockAdapter now properly reads a body and emits a `headers` event
+* Updated Url class to check if a scheme and host are set before adding ":"
+  and "//". This allows empty Url (e.g., "") to be serialized as "".
+* Parsing invalid XML no longer emits warnings
+* Curl classes now properly throw AdapterExceptions
+* Various performance optimizations
+* Streams are created with the faster `Stream\create()` function
+* Marked deprecation_proxy() as internal
+* Test server is now a collection of static methods on a class
+
+## 4.0.0-rc.1 - 2014-03-15
+
+* See https://github.com/guzzle/guzzle/blob/master/UPGRADING.md#3x-to-40
+
+## 3.8.1 - 2014-01-28
+
+* Bug: Always using GET requests when redirecting from a 303 response
+* Bug: CURLOPT_SSL_VERIFYHOST is now correctly set to false when setting `$certificateAuthority` to false in
+  `Guzzle\Http\ClientInterface::setSslVerification()`
+* Bug: RedirectPlugin now uses strict RFC 3986 compliance when combining a base URL with a relative URL
+* Bug: The body of a request can now be set to `"0"`
+* Sending PHP stream requests no longer forces `HTTP/1.0`
+* Adding more information to ExceptionCollection exceptions so that users have more context, including a stack trace of
+  each sub-exception
+* Updated the `$ref` attribute in service descriptions to merge over any existing parameters of a schema (rather than
+  clobbering everything).
+* Merging URLs will now use the query string object from the relative URL (thus allowing custom query aggregators)
+* Query strings are now parsed in a way that they do no convert empty keys with no value to have a dangling `=`.
+  For example `foo&bar=baz` is now correctly parsed and recognized as `foo&bar=baz` rather than `foo=&bar=baz`.
+* Now properly escaping the regular expression delimiter when matching Cookie domains.
+* Network access is now disabled when loading XML documents
+
+## 3.8.0 - 2013-12-05
+
+* Added the ability to define a POST name for a file
+* JSON response parsing now properly walks additionalProperties
+* cURL error code 18 is now retried automatically in the BackoffPlugin
+* Fixed a cURL error when URLs contain fragments
+* Fixed an issue in the BackoffPlugin retry event where it was trying to access all exceptions as if they were
+  CurlExceptions
+* CURLOPT_PROGRESS function fix for PHP 5.5 (69fcc1e)
+* Added the ability for Guzzle to work with older versions of cURL that do not support `CURLOPT_TIMEOUT_MS`
+* Fixed a bug that was encountered when parsing empty header parameters
+* UriTemplate now has a `setRegex()` method to match the docs
+* The `debug` request parameter now checks if it is truthy rather than if it exists
+* Setting the `debug` request parameter to true shows verbose cURL output instead of using the LogPlugin
+* Added the ability to combine URLs using strict RFC 3986 compliance
+* Command objects can now return the validation errors encountered by the command
+* Various fixes to cache revalidation (#437 and 29797e5)
+* Various fixes to the AsyncPlugin
+* Cleaned up build scripts
+
+## 3.7.4 - 2013-10-02
+
+* Bug fix: 0 is now an allowed value in a description parameter that has a default value (#430)
+* Bug fix: SchemaFormatter now returns an integer when formatting to a Unix timestamp
+  (see https://github.com/aws/aws-sdk-php/issues/147)
+* Bug fix: Cleaned up and fixed URL dot segment removal to properly resolve internal dots
+* Minimum PHP version is now properly specified as 5.3.3 (up from 5.3.2) (#420)
+* Updated the bundled cacert.pem (#419)
+* OauthPlugin now supports adding authentication to headers or query string (#425)
+
+## 3.7.3 - 2013-09-08
+
+* Added the ability to get the exception associated with a request/command when using `MultiTransferException` and
+  `CommandTransferException`.
+* Setting `additionalParameters` of a response to false is now honored when parsing responses with a service description
+* Schemas are only injected into response models when explicitly configured.
+* No longer guessing Content-Type based on the path of a request. Content-Type is now only guessed based on the path of
+  an EntityBody.
+* Bug fix: ChunkedIterator can now properly chunk a \Traversable as well as an \Iterator.
+* Bug fix: FilterIterator now relies on `\Iterator` instead of `\Traversable`.
+* Bug fix: Gracefully handling malformed responses in RequestMediator::writeResponseBody()
+* Bug fix: Replaced call to canCache with canCacheRequest in the CallbackCanCacheStrategy of the CachePlugin
+* Bug fix: Visiting XML attributes first before visiting XML children when serializing requests
+* Bug fix: Properly parsing headers that contain commas contained in quotes
+* Bug fix: mimetype guessing based on a filename is now case-insensitive
+
+## 3.7.2 - 2013-08-02
+
+* Bug fix: Properly URL encoding paths when using the PHP-only version of the UriTemplate expander
+  See https://github.com/guzzle/guzzle/issues/371
+* Bug fix: Cookie domains are now matched correctly according to RFC 6265
+  See https://github.com/guzzle/guzzle/issues/377
+* Bug fix: GET parameters are now used when calculating an OAuth signature
+* Bug fix: Fixed an issue with cache revalidation where the If-None-Match header was being double quoted
+* `Guzzle\Common\AbstractHasDispatcher::dispatch()` now returns the event that was dispatched
+* `Guzzle\Http\QueryString::factory()` now guesses the most appropriate query aggregator to used based on the input.
+  See https://github.com/guzzle/guzzle/issues/379
+* Added a way to add custom domain objects to service description parsing using the `operation.parse_class` event. See
+  https://github.com/guzzle/guzzle/pull/380
+* cURL multi cleanup and optimizations
+
+## 3.7.1 - 2013-07-05
+
+* Bug fix: Setting default options on a client now works
+* Bug fix: Setting options on HEAD requests now works. See #352
+* Bug fix: Moving stream factory before send event to before building the stream. See #353
+* Bug fix: Cookies no longer match on IP addresses per RFC 6265
+* Bug fix: Correctly parsing header parameters that are in `<>` and quotes
+* Added `cert` and `ssl_key` as request options
+* `Host` header can now diverge from the host part of a URL if the header is set manually
+* `Guzzle\Service\Command\LocationVisitor\Request\XmlVisitor` was rewritten to change from using SimpleXML to XMLWriter
+* OAuth parameters are only added via the plugin if they aren't already set
+* Exceptions are now thrown when a URL cannot be parsed
+* Returning `false` if `Guzzle\Http\EntityBody::getContentMd5()` fails
+* Not setting a `Content-MD5` on a command if calculating the Content-MD5 fails via the CommandContentMd5Plugin
+
+## 3.7.0 - 2013-06-10
+
+* See UPGRADING.md for more information on how to upgrade.
+* Requests now support the ability to specify an array of $options when creating a request to more easily modify a
+  request. You can pass a 'request.options' configuration setting to a client to apply default request options to
+  every request created by a client (e.g. default query string variables, headers, curl options, etc.).
+* Added a static facade class that allows you to use Guzzle with static methods and mount the class to `\Guzzle`.
+  See `Guzzle\Http\StaticClient::mount`.
+* Added `command.request_options` to `Guzzle\Service\Command\AbstractCommand` to pass request options to requests
+      created by a command (e.g. custom headers, query string variables, timeout settings, etc.).
+* Stream size in `Guzzle\Stream\PhpStreamRequestFactory` will now be set if Content-Length is returned in the
+  headers of a response
+* Added `Guzzle\Common\Collection::setPath($path, $value)` to set a value into an array using a nested key
+  (e.g. `$collection->setPath('foo/baz/bar', 'test'); echo $collection['foo']['bar']['bar'];`)
+* ServiceBuilders now support storing and retrieving arbitrary data
+* CachePlugin can now purge all resources for a given URI
+* CachePlugin can automatically purge matching cached items when a non-idempotent request is sent to a resource
+* CachePlugin now uses the Vary header to determine if a resource is a cache hit
+* `Guzzle\Http\Message\Response` now implements `\Serializable`
+* Added `Guzzle\Cache\CacheAdapterFactory::fromCache()` to more easily create cache adapters
+* `Guzzle\Service\ClientInterface::execute()` now accepts an array, single command, or Traversable
+* Fixed a bug in `Guzzle\Http\Message\Header\Link::addLink()`
+* Better handling of calculating the size of a stream in `Guzzle\Stream\Stream` using fstat() and caching the size
+* `Guzzle\Common\Exception\ExceptionCollection` now creates a more readable exception message
+* Fixing BC break: Added back the MonologLogAdapter implementation rather than extending from PsrLog so that older
+  Symfony users can still use the old version of Monolog.
+* Fixing BC break: Added the implementation back in for `Guzzle\Http\Message\AbstractMessage::getTokenizedHeader()`.
+  Now triggering an E_USER_DEPRECATED warning when used. Use `$message->getHeader()->parseParams()`.
+* Several performance improvements to `Guzzle\Common\Collection`
+* Added an `$options` argument to the end of the following methods of `Guzzle\Http\ClientInterface`:
+  createRequest, head, delete, put, patch, post, options, prepareRequest
+* Added an `$options` argument to the end of `Guzzle\Http\Message\Request\RequestFactoryInterface::createRequest()`
+* Added an `applyOptions()` method to `Guzzle\Http\Message\Request\RequestFactoryInterface`
+* Changed `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $body = null)` to
+  `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $options = array())`. You can still pass in a
+  resource, string, or EntityBody into the $options parameter to specify the download location of the response.
+* Changed `Guzzle\Common\Collection::__construct($data)` to no longer accepts a null value for `$data` but a
+  default `array()`
+* Added `Guzzle\Stream\StreamInterface::isRepeatable`
+* Removed `Guzzle\Http\ClientInterface::setDefaultHeaders(). Use
+  $client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`. or
+  $client->getConfig()->setPath('request.options/headers', array('header_name' => 'value'))`.
+* Removed `Guzzle\Http\ClientInterface::getDefaultHeaders(). Use $client->getConfig()->getPath('request.options/headers')`.
+* Removed `Guzzle\Http\ClientInterface::expandTemplate()`
+* Removed `Guzzle\Http\ClientInterface::setRequestFactory()`
+* Removed `Guzzle\Http\ClientInterface::getCurlMulti()`
+* Removed `Guzzle\Http\Message\RequestInterface::canCache`
+* Removed `Guzzle\Http\Message\RequestInterface::setIsRedirect`
+* Removed `Guzzle\Http\Message\RequestInterface::isRedirect`
+* Made `Guzzle\Http\Client::expandTemplate` and `getUriTemplate` protected methods.
+* You can now enable E_USER_DEPRECATED warnings to see if you are using a deprecated method by setting
+  `Guzzle\Common\Version::$emitWarnings` to true.
+* Marked `Guzzle\Http\Message\Request::isResponseBodyRepeatable()` as deprecated. Use
+      `$request->getResponseBody()->isRepeatable()` instead.
+* Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use
+  `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
+* Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use
+  `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
+* Marked `Guzzle\Http\Message\Request::setIsRedirect()` as deprecated. Use the HistoryPlugin instead.
+* Marked `Guzzle\Http\Message\Request::isRedirect()` as deprecated. Use the HistoryPlugin instead.
+* Marked `Guzzle\Cache\CacheAdapterFactory::factory()` as deprecated
+* Marked 'command.headers', 'command.response_body' and 'command.on_complete' as deprecated for AbstractCommand.
+  These will work through Guzzle 4.0
+* Marked 'request.params' for `Guzzle\Http\Client` as deprecated. Use [request.options][params].
+* Marked `Guzzle\Service\Client::enableMagicMethods()` as deprecated. Magic methods can no longer be disabled on a Guzzle\Service\Client.
+* Marked `Guzzle\Service\Client::getDefaultHeaders()` as deprecated. Use $client->getConfig()->getPath('request.options/headers')`.
+* Marked `Guzzle\Service\Client::setDefaultHeaders()` as deprecated. Use $client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`.
+* Marked `Guzzle\Parser\Url\UrlParser` as deprecated. Just use PHP's `parse_url()` and percent encode your UTF-8.
+* Marked `Guzzle\Common\Collection::inject()` as deprecated.
+* Marked `Guzzle\Plugin\CurlAuth\CurlAuthPlugin` as deprecated. Use `$client->getConfig()->setPath('request.options/auth', array('user', 'pass', 'Basic|Digest');`
+* CacheKeyProviderInterface and DefaultCacheKeyProvider are no longer used. All of this logic is handled in a
+  CacheStorageInterface. These two objects and interface will be removed in a future version.
+* Always setting X-cache headers on cached responses
+* Default cache TTLs are now handled by the CacheStorageInterface of a CachePlugin
+* `CacheStorageInterface::cache($key, Response $response, $ttl = null)` has changed to `cache(RequestInterface
+  $request, Response $response);`
+* `CacheStorageInterface::fetch($key)` has changed to `fetch(RequestInterface $request);`
+* `CacheStorageInterface::delete($key)` has changed to `delete(RequestInterface $request);`
+* Added `CacheStorageInterface::purge($url)`
+* `DefaultRevalidation::__construct(CacheKeyProviderInterface $cacheKey, CacheStorageInterface $cache, CachePlugin
+  $plugin)` has changed to `DefaultRevalidation::__construct(CacheStorageInterface $cache,
+  CanCacheStrategyInterface $canCache = null)`
+* Added `RevalidationInterface::shouldRevalidate(RequestInterface $request, Response $response)`
+
+## 3.6.0 - 2013-05-29
+
+* ServiceDescription now implements ToArrayInterface
+* Added command.hidden_params to blacklist certain headers from being treated as additionalParameters
+* Guzzle can now correctly parse incomplete URLs
+* Mixed casing of headers are now forced to be a single consistent casing across all values for that header.
+* Messages internally use a HeaderCollection object to delegate handling case-insensitive header resolution
+* Removed the whole changedHeader() function system of messages because all header changes now go through addHeader().
+* Specific header implementations can be created for complex headers. When a message creates a header, it uses a
+  HeaderFactory which can map specific headers to specific header classes. There is now a Link header and
+  CacheControl header implementation.
+* Removed from interface: Guzzle\Http\ClientInterface::setUriTemplate
+* Removed from interface: Guzzle\Http\ClientInterface::setCurlMulti()
+* Removed Guzzle\Http\Message\Request::receivedRequestHeader() and implemented this functionality in
+  Guzzle\Http\Curl\RequestMediator
+* Removed the optional $asString parameter from MessageInterface::getHeader(). Just cast the header to a string.
+* Removed the optional $tryChunkedTransfer option from Guzzle\Http\Message\EntityEnclosingRequestInterface
+* Removed the $asObjects argument from Guzzle\Http\Message\MessageInterface::getHeaders()
+* Removed Guzzle\Parser\ParserRegister::get(). Use getParser()
+* Removed Guzzle\Parser\ParserRegister::set(). Use registerParser().
+* All response header helper functions return a string rather than mixing Header objects and strings inconsistently
+* Removed cURL blacklist support. This is no longer necessary now that Expect, Accept, etc. are managed by Guzzle
+  directly via interfaces
+* Removed the injecting of a request object onto a response object. The methods to get and set a request still exist
+  but are a no-op until removed.
+* Most classes that used to require a `Guzzle\Service\Command\CommandInterface` typehint now request a
+  `Guzzle\Service\Command\ArrayCommandInterface`.
+* Added `Guzzle\Http\Message\RequestInterface::startResponse()` to the RequestInterface to handle injecting a response
+  on a request while the request is still being transferred
+* The ability to case-insensitively search for header values
+* Guzzle\Http\Message\Header::hasExactHeader
+* Guzzle\Http\Message\Header::raw. Use getAll()
+* Deprecated cache control specific methods on Guzzle\Http\Message\AbstractMessage. Use the CacheControl header object
+  instead.
+* `Guzzle\Service\Command\CommandInterface` now extends from ToArrayInterface and ArrayAccess
+* Added the ability to cast Model objects to a string to view debug information.
+
+## 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
+* Bug: Better cleanup of one-time events across the board (when an event is meant to fire once, it will now remove
+  itself from the EventDispatcher)
+* Bug: `Guzzle\Log\MessageFormatter` now properly writes "total_time" and "connect_time" values
+* Bug: Cloning an EntityEnclosingRequest now clones the EntityBody too
+* Bug: Fixed an undefined index error when parsing nested JSON responses with a sentAs parameter that reference a
+  non-existent key
+* Bug: All __call() method arguments are now required (helps with mocking frameworks)
+* Deprecating Response::getRequest() and now using a shallow clone of a request object to remove a circular reference
+  to help with refcount based garbage collection of resources created by sending a request
+* Deprecating ZF1 cache and log adapters. These will be removed in the next major version.
+* Deprecating `Response::getPreviousResponse()` (method signature still exists, but it's deprecated). Use the
+  HistoryPlugin for a history.
+* Added a `responseBody` alias for the `response_body` location
+* Refactored internals to no longer rely on Response::getRequest()
+* HistoryPlugin can now be cast to a string
+* HistoryPlugin now logs transactions rather than requests and responses to more accurately keep track of the requests
+  and responses that are sent over the wire
+* Added `getEffectiveUrl()` and `getRedirectCount()` to Response objects
+
+## 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
+
+## 3.4.2 - 2013-04-29
+
+* Bug fix: Stream objects now work correctly with "a" and "a+" modes
+* Bug fix: Removing `Transfer-Encoding: chunked` header when a Content-Length is present
+* Bug fix: AsyncPlugin no longer forces HEAD requests
+* Bug fix: DateTime timezones are now properly handled when using the service description schema formatter
+* Bug fix: CachePlugin now properly handles stale-if-error directives when a request to the origin server fails
+* Setting a response on a request will write to the custom request body from the response body if one is specified
+* LogPlugin now writes to php://output when STDERR is undefined
+* Added the ability to set multiple POST files for the same key in a single call
+* application/x-www-form-urlencoded POSTs now use the utf-8 charset by default
+* Added the ability to queue CurlExceptions to the MockPlugin
+* Cleaned up how manual responses are queued on requests (removed "queued_response" and now using request.before_send)
+* Configuration loading now allows remote files
+
+## 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
+  handles. This greatly simplifies the implementation, fixes a couple bugs, and provides a small performance boost.
+* Exceptions are now properly grouped when sending requests in parallel
+* Redirects are now properly aggregated when a multi transaction fails
+* Redirects now set the response on the original object even in the event of a failure
+* Bug fix: Model names are now properly set even when using $refs
+* Added support for PHP 5.5's CurlFile to prevent warnings with the deprecated @ syntax
+* Added support for oauth_callback in OAuth signatures
+* Added support for oauth_verifier in OAuth signatures
+* Added support to attempt to retrieve a command first literally, then ucfirst, the with inflection
+
+## 3.4.0 - 2013-04-11
+
+* Bug fix: URLs are now resolved correctly based on https://tools.ietf.org/html/rfc3986#section-5.2. #289
+* Bug fix: Absolute URLs with a path in a service description will now properly override the base URL. #289
+* Bug fix: Parsing a query string with a single PHP array value will now result in an array. #263
+* Bug fix: Better normalization of the User-Agent header to prevent duplicate headers. #264.
+* Bug fix: Added `number` type to service descriptions.
+* Bug fix: empty parameters are removed from an OAuth signature
+* Bug fix: Revalidating a cache entry prefers the Last-Modified over the Date header
+* Bug fix: Fixed "array to string" error when validating a union of types in a service description
+* Bug fix: Removed code that attempted to determine the size of a stream when data is written to the stream
+* Bug fix: Not including an `oauth_token` if the value is null in the OauthPlugin.
+* Bug fix: Now correctly aggregating successful requests and failed requests in CurlMulti when a redirect occurs.
+* The new default CURLOPT_TIMEOUT setting has been increased to 150 seconds so that Guzzle works on poor connections.
+* Added a feature to EntityEnclosingRequest::setBody() that will automatically set the Content-Type of the request if
+  the Content-Type can be determined based on the entity body or the path of the request.
+* Added the ability to overwrite configuration settings in a client when grabbing a throwaway client from a builder.
+* Added support for a PSR-3 LogAdapter.
+* Added a `command.after_prepare` event
+* Added `oauth_callback` parameter to the OauthPlugin
+* Added the ability to create a custom stream class when using a stream factory
+* Added a CachingEntityBody decorator
+* Added support for `additionalParameters` in service descriptions to define how custom parameters are serialized.
+* The bundled SSL certificate is now provided in the phar file and extracted when running Guzzle from a phar.
+* You can now send any EntityEnclosingRequest with POST fields or POST files and cURL will handle creating bodies
+* POST requests using a custom entity body are now treated exactly like PUT requests but with a custom cURL method. This
+  means that the redirect behavior of POST requests with custom bodies will not be the same as POST requests that use
+  POST fields or files (the latter is only used when emulating a form POST in the browser).
+* Lots of cleanup to CurlHandle::factory and RequestFactory::createRequest
+
+## 3.3.1 - 2013-03-10
+
+* Added the ability to create PHP streaming responses from HTTP requests
+* Bug fix: Running any filters when parsing response headers with service descriptions
+* Bug fix: OauthPlugin fixes to allow for multi-dimensional array signing, and sorting parameters before signing
+* Bug fix: Removed the adding of default empty arrays and false Booleans to responses in order to be consistent across
+  response location visitors.
+* Bug fix: Removed the possibility of creating configuration files with circular dependencies
+* RequestFactory::create() now uses the key of a POST file when setting the POST file name
+* Added xmlAllowEmpty to serialize an XML body even if no XML specific parameters are set
+
+## 3.3.0 - 2013-03-03
+
+* A large number of performance optimizations have been made
+* Bug fix: Added 'wb' as a valid write mode for streams
+* Bug fix: `Guzzle\Http\Message\Response::json()` now allows scalar values to be returned
+* Bug fix: Fixed bug in `Guzzle\Http\Message\Response` where wrapping quotes were stripped from `getEtag()`
+* BC: Removed `Guzzle\Http\Utils` class
+* BC: Setting a service description on a client will no longer modify the client's command factories.
+* BC: Emitting IO events from a RequestMediator is now a parameter that must be set in a request's curl options using
+  the 'emit_io' key. This was previously set under a request's parameters using 'curl.emit_io'
+* BC: `Guzzle\Stream\Stream::getWrapper()` and `Guzzle\Stream\Stream::getSteamType()` are no longer converted to
+  lowercase
+* Operation parameter objects are now lazy loaded internally
+* Added ErrorResponsePlugin that can throw errors for responses defined in service description operations' errorResponses
+* Added support for instantiating responseType=class responseClass classes. Classes must implement
+  `Guzzle\Service\Command\ResponseClassInterface`
+* Added support for additionalProperties for top-level parameters in responseType=model responseClasses. These
+  additional properties also support locations and can be used to parse JSON responses where the outermost part of the
+  JSON is an array
+* Added support for nested renaming of JSON models (rename sentAs to name)
+* CachePlugin
+    * Added support for stale-if-error so that the CachePlugin can now serve stale content from the cache on error
+    * Debug headers can now added to cached response in the CachePlugin
+
+## 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.
+* URLs with no path no longer contain a "/" by default
+* Guzzle\Http\QueryString does no longer manages the leading "?". This is now handled in Guzzle\Http\Url.
+* BadResponseException no longer includes the full request and response message
+* Adding setData() to Guzzle\Service\Description\ServiceDescriptionInterface
+* Adding getResponseBody() to Guzzle\Http\Message\RequestInterface
+* Various updates to classes to use ServiceDescriptionInterface type hints rather than ServiceDescription
+* Header values can now be normalized into distinct values when multiple headers are combined with a comma separated list
+* xmlEncoding can now be customized for the XML declaration of a XML service description operation
+* Guzzle\Http\QueryString now uses Guzzle\Http\QueryAggregator\QueryAggregatorInterface objects to add custom value
+  aggregation and no longer uses callbacks
+* The URL encoding implementation of Guzzle\Http\QueryString can now be customized
+* Bug fix: Filters were not always invoked for array service description parameters
+* Bug fix: Redirects now use a target response body rather than a temporary response body
+* Bug fix: The default exponential backoff BackoffPlugin was not giving when the request threshold was exceeded
+* Bug fix: Guzzle now takes the first found value when grabbing Cache-Control directives
+
+## 3.1.2 - 2013-01-27
+
+* Refactored how operation responses are parsed. Visitors now include a before() method responsible for parsing the
+  response body. For example, the XmlVisitor now parses the XML response into an array in the before() method.
+* Fixed an issue where cURL would not automatically decompress responses when the Accept-Encoding header was sent
+* CURLOPT_SSL_VERIFYHOST is never set to 1 because it is deprecated (see 5e0ff2ef20f839e19d1eeb298f90ba3598784444)
+* Fixed a bug where redirect responses were not chained correctly using getPreviousResponse()
+* Setting default headers on a client after setting the user-agent will not erase the user-agent setting
+
+## 3.1.1 - 2013-01-20
+
+* Adding wildcard support to Guzzle\Common\Collection::getPath()
+* Adding alias support to ServiceBuilder configs
+* Adding Guzzle\Service\Resource\CompositeResourceIteratorFactory and cleaning up factory interface
+
+## 3.1.0 - 2013-01-12
+
+* BC: CurlException now extends from RequestException rather than BadResponseException
+* BC: Renamed Guzzle\Plugin\Cache\CanCacheStrategyInterface::canCache() to canCacheRequest() and added CanCacheResponse()
+* Added getData to ServiceDescriptionInterface
+* Added context array to RequestInterface::setState()
+* Bug: Removing hard dependency on the BackoffPlugin from Guzzle\Http
+* Bug: Adding required content-type when JSON request visitor adds JSON to a command
+* Bug: Fixing the serialization of a service description with custom data
+* Made it easier to deal with exceptions thrown when transferring commands or requests in parallel by providing
+  an array of successful and failed responses
+* Moved getPath from Guzzle\Service\Resource\Model to Guzzle\Common\Collection
+* Added Guzzle\Http\IoEmittingEntityBody
+* Moved command filtration from validators to location visitors
+* Added `extends` attributes to service description parameters
+* Added getModels to ServiceDescriptionInterface
+
+## 3.0.7 - 2012-12-19
+
+* Fixing phar detection when forcing a cacert to system if null or true
+* Allowing filename to be passed to `Guzzle\Http\Message\Request::setResponseBody()`
+* Cleaning up `Guzzle\Common\Collection::inject` method
+* Adding a response_body location to service descriptions
+
+## 3.0.6 - 2012-12-09
+
+* CurlMulti performance improvements
+* Adding setErrorResponses() to Operation
+* composer.json tweaks
+
+## 3.0.5 - 2012-11-18
+
+* Bug: Fixing an infinite recursion bug caused from revalidating with the CachePlugin
+* Bug: Response body can now be a string containing "0"
+* Bug: Using Guzzle inside of a phar uses system by default but now allows for a custom cacert
+* Bug: QueryString::fromString now properly parses query string parameters that contain equal signs
+* Added support for XML attributes in service description responses
+* DefaultRequestSerializer now supports array URI parameter values for URI template expansion
+* Added better mimetype guessing to requests and post files
+
+## 3.0.4 - 2012-11-11
+
+* Bug: Fixed a bug when adding multiple cookies to a request to use the correct glue value
+* Bug: Cookies can now be added that have a name, domain, or value set to "0"
+* Bug: Using the system cacert bundle when using the Phar
+* Added json and xml methods to Response to make it easier to parse JSON and XML response data into data structures
+* Enhanced cookie jar de-duplication
+* Added the ability to enable strict cookie jars that throw exceptions when invalid cookies are added
+* Added setStream to StreamInterface to actually make it possible to implement custom rewind behavior for entity bodies
+* Added the ability to create any sort of hash for a stream rather than just an MD5 hash
+
+## 3.0.3 - 2012-11-04
+
+* Implementing redirects in PHP rather than cURL
+* Added PECL URI template extension and using as default parser if available
+* Bug: Fixed Content-Length parsing of Response factory
+* Adding rewind() method to entity bodies and streams. Allows for custom rewinding of non-repeatable streams.
+* Adding ToArrayInterface throughout library
+* Fixing OauthPlugin to create unique nonce values per request
+
+## 3.0.2 - 2012-10-25
+
+* Magic methods are enabled by default on clients
+* Magic methods return the result of a command
+* Service clients no longer require a base_url option in the factory
+* Bug: Fixed an issue with URI templates where null template variables were being expanded
+
+## 3.0.1 - 2012-10-22
+
+* Models can now be used like regular collection objects by calling filter, map, etc.
+* Models no longer require a Parameter structure or initial data in the constructor
+* Added a custom AppendIterator to get around a PHP bug with the `\AppendIterator`
+
+## 3.0.0 - 2012-10-15
+
+* Rewrote service description format to be based on Swagger
+    * Now based on JSON schema
+    * Added nested input structures and nested response models
+    * Support for JSON and XML input and output models
+    * Renamed `commands` to `operations`
+    * Removed dot class notation
+    * Removed custom types
+* Broke the project into smaller top-level namespaces to be more component friendly
+* Removed support for XML configs and descriptions. Use arrays or JSON files.
+* Removed the Validation component and Inspector
+* Moved all cookie code to Guzzle\Plugin\Cookie
+* Magic methods on a Guzzle\Service\Client now return the command un-executed.
+* Calling getResult() or getResponse() on a command will lazily execute the command if needed.
+* Now shipping with cURL's CA certs and using it by default
+* Added previousResponse() method to response objects
+* No longer sending Accept and Accept-Encoding headers on every request
+* Only sending an Expect header by default when a payload is greater than 1MB
+* Added/moved client options:
+    * curl.blacklist to curl.option.blacklist
+    * Added ssl.certificate_authority
+* Added a Guzzle\Iterator component
+* Moved plugins from Guzzle\Http\Plugin to Guzzle\Plugin
+* Added a more robust backoff retry strategy (replaced the ExponentialBackoffPlugin)
+* Added a more robust caching plugin
+* Added setBody to response objects
+* Updating LogPlugin to use a more flexible MessageFormatter
+* Added a completely revamped build process
+* Cleaning up Collection class and removing default values from the get method
+* Fixed ZF2 cache adapters
+
+## 2.8.8 - 2012-10-15
+
+* Bug: Fixed a cookie issue that caused dot prefixed domains to not match where popular browsers did
+
+## 2.8.7 - 2012-09-30
+
+* Bug: Fixed config file aliases for JSON includes
+* Bug: Fixed cookie bug on a request object by using CookieParser to parse cookies on requests
+* Bug: Removing the path to a file when sending a Content-Disposition header on a POST upload
+* Bug: Hardening request and response parsing to account for missing parts
+* Bug: Fixed PEAR packaging
+* Bug: Fixed Request::getInfo
+* Bug: Fixed cases where CURLM_CALL_MULTI_PERFORM return codes were causing curl transactions to fail
+* Adding the ability for the namespace Iterator factory to look in multiple directories
+* Added more getters/setters/removers from service descriptions
+* Added the ability to remove POST fields from OAuth signatures
+* OAuth plugin now supports 2-legged OAuth
+
+## 2.8.6 - 2012-09-05
+
+* Added the ability to modify and build service descriptions
+* Added the use of visitors to apply parameters to locations in service descriptions using the dynamic command
+* Added a `json` parameter location
+* Now allowing dot notation for classes in the CacheAdapterFactory
+* Using the union of two arrays rather than an array_merge when extending service builder services and service params
+* Ensuring that a service is a string before doing strpos() checks on it when substituting services for references
+  in service builder config files.
+* Services defined in two different config files that include one another will by default replace the previously
+  defined service, but you can now create services that extend themselves and merge their settings over the previous
+* The JsonLoader now supports aliasing filenames with different filenames. This allows you to alias something like
+  '_default' with a default JSON configuration file.
+
+## 2.8.5 - 2012-08-29
+
+* Bug: Suppressed empty arrays from URI templates
+* Bug: Added the missing $options argument from ServiceDescription::factory to enable caching
+* Added support for HTTP responses that do not contain a reason phrase in the start-line
+* AbstractCommand commands are now invokable
+* Added a way to get the data used when signing an Oauth request before a request is sent
+
+## 2.8.4 - 2012-08-15
+
+* Bug: Custom delay time calculations are no longer ignored in the ExponentialBackoffPlugin
+* Added the ability to transfer entity bodies as a string rather than streamed. This gets around curl error 65. Set `body_as_string` in a request's curl options to enable.
+* Added a StreamInterface, EntityBodyInterface, and added ftell() to Guzzle\Common\Stream
+* Added an AbstractEntityBodyDecorator and a ReadLimitEntityBody decorator to transfer only a subset of a decorated stream
+* Stream and EntityBody objects will now return the file position to the previous position after a read required operation (e.g. getContentMd5())
+* Added additional response status codes
+* Removed SSL information from the default User-Agent header
+* DELETE requests can now send an entity body
+* Added an EventDispatcher to the ExponentialBackoffPlugin and added an ExponentialBackoffLogger to log backoff retries
+* Added the ability of the MockPlugin to consume mocked request bodies
+* LogPlugin now exposes request and response objects in the extras array
+
+## 2.8.3 - 2012-07-30
+
+* Bug: Fixed a case where empty POST requests were sent as GET requests
+* Bug: Fixed a bug in ExponentialBackoffPlugin that caused fatal errors when retrying an EntityEnclosingRequest that does not have a body
+* Bug: Setting the response body of a request to null after completing a request, not when setting the state of a request to new
+* Added multiple inheritance to service description commands
+* Added an ApiCommandInterface and added `getParamNames()` and `hasParam()`
+* Removed the default 2mb size cutoff from the Md5ValidatorPlugin so that it now defaults to validating everything
+* Changed CurlMulti::perform to pass a smaller timeout to CurlMulti::executeHandles
+
+## 2.8.2 - 2012-07-24
+
+* Bug: Query string values set to 0 are no longer dropped from the query string
+* Bug: A Collection object is no longer created each time a call is made to `Guzzle\Service\Command\AbstractCommand::getRequestHeaders()`
+* Bug: `+` is now treated as an encoded space when parsing query strings
+* QueryString and Collection performance improvements
+* Allowing dot notation for class paths in filters attribute of a service descriptions
+
+## 2.8.1 - 2012-07-16
+
+* Loosening Event Dispatcher dependency
+* POST redirects can now be customized using CURLOPT_POSTREDIR
+
+## 2.8.0 - 2012-07-15
+
+* BC: Guzzle\Http\Query
+    * Query strings with empty variables will always show an equal sign unless the variable is set to QueryString::BLANK (e.g. ?acl= vs ?acl)
+    * Changed isEncodingValues() and isEncodingFields() to isUrlEncoding()
+    * Changed setEncodeValues(bool) and setEncodeFields(bool) to useUrlEncoding(bool)
+    * Changed the aggregation functions of QueryString to be static methods
+    * Can now use fromString() with querystrings that have a leading ?
+* cURL configuration values can be specified in service descriptions using `curl.` prefixed parameters
+* Content-Length is set to 0 before emitting the request.before_send event when sending an empty request body
+* Cookies are no longer URL decoded by default
+* Bug: URI template variables set to null are no longer expanded
+
+## 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.
+* BC: Removing Guzzle\Common\Batch\Batch::count() and replacing it with isEmpty()
+* CachePlugin now allows for a custom request parameter function to check if a request can be cached
+* Bug fix: CachePlugin now only caches GET and HEAD requests by default
+* Bug fix: Using header glue when transferring headers over the wire
+* Allowing deeply nested arrays for composite variables in URI templates
+* Batch divisors can now return iterators or arrays
+
+## 2.7.1 - 2012-06-26
+
+* Minor patch to update version number in UA string
+* Updating build process
+
+## 2.7.0 - 2012-06-25
+
+* BC: Inflection classes moved to Guzzle\Inflection. No longer static methods. Can now inject custom inflectors into classes.
+* BC: Removed magic setX methods from commands
+* BC: Magic methods mapped to service description commands are now inflected in the command factory rather than the client __call() method
+* Verbose cURL options are no longer enabled by default. Set curl.debug to true on a client to enable.
+* Bug: Now allowing colons in a response start-line (e.g. HTTP/1.1 503 Service Unavailable: Back-end server is at capacity)
+* Guzzle\Service\Resource\ResourceIteratorApplyBatched now internally uses the Guzzle\Common\Batch namespace
+* Added Guzzle\Service\Plugin namespace and a PluginCollectionPlugin
+* Added the ability to set POST fields and files in a service description
+* Guzzle\Http\EntityBody::factory() now accepts objects with a __toString() method
+* Adding a command.before_prepare event to clients
+* Added BatchClosureTransfer and BatchClosureDivisor
+* BatchTransferException now includes references to the batch divisor and transfer strategies
+* Fixed some tests so that they pass more reliably
+* Added Guzzle\Common\Log\ArrayLogAdapter
+
+## 2.6.6 - 2012-06-10
+
+* BC: Removing Guzzle\Http\Plugin\BatchQueuePlugin
+* BC: Removing Guzzle\Service\Command\CommandSet
+* Adding generic batching system (replaces the batch queue plugin and command set)
+* Updating ZF cache and log adapters and now using ZF's composer repository
+* Bug: Setting the name of each ApiParam when creating through an ApiCommand
+* Adding result_type, result_doc, deprecated, and doc_url to service descriptions
+* Bug: Changed the default cookie header casing back to 'Cookie'
+
+## 2.6.5 - 2012-06-03
+
+* BC: Renaming Guzzle\Http\Message\RequestInterface::getResourceUri() to getResource()
+* BC: Removing unused AUTH_BASIC and AUTH_DIGEST constants from
+* BC: Guzzle\Http\Cookie is now used to manage Set-Cookie data, not Cookie data
+* BC: Renaming methods in the CookieJarInterface
+* Moving almost all cookie logic out of the CookiePlugin and into the Cookie or CookieJar implementations
+* Making the default glue for HTTP headers ';' instead of ','
+* Adding a removeValue to Guzzle\Http\Message\Header
+* Adding getCookies() to request interface.
+* Making it easier to add event subscribers to HasDispatcherInterface classes. Can now directly call addSubscriber()
+
+## 2.6.4 - 2012-05-30
+
+* BC: Cleaning up how POST files are stored in EntityEnclosingRequest objects. Adding PostFile class.
+* BC: Moving ApiCommand specific functionality from the Inspector and on to the ApiCommand
+* Bug: Fixing magic method command calls on clients
+* Bug: Email constraint only validates strings
+* Bug: Aggregate POST fields when POST files are present in curl handle
+* Bug: Fixing default User-Agent header
+* Bug: Only appending or prepending parameters in commands if they are specified
+* Bug: Not requiring response reason phrases or status codes to match a predefined list of codes
+* Allowing the use of dot notation for class namespaces when using instance_of constraint
+* Added any_match validation constraint
+* Added an AsyncPlugin
+* Passing request object to the calculateWait method of the ExponentialBackoffPlugin
+* Allowing the result of a command object to be changed
+* Parsing location and type sub values when instantiating a service description rather than over and over at runtime
+
+## 2.6.3 - 2012-05-23
+
+* [BC] Guzzle\Common\FromConfigInterface no longer requires any config options.
+* [BC] Refactoring how POST files are stored on an EntityEnclosingRequest. They are now separate from POST fields.
+* You can now use an array of data when creating PUT request bodies in the request factory.
+* Removing the requirement that HTTPS requests needed a Cache-Control: public directive to be cacheable.
+* [Http] Adding support for Content-Type in multipart POST uploads per upload
+* [Http] Added support for uploading multiple files using the same name (foo[0], foo[1])
+* Adding more POST data operations for easier manipulation of POST data.
+* You can now set empty POST fields.
+* The body of a request is only shown on EntityEnclosingRequest objects that do not use POST files.
+* Split the Guzzle\Service\Inspector::validateConfig method into two methods. One to initialize when a command is created, and one to validate.
+* CS updates
+
+## 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.
+
+## 2.6.1 - 2012-05-19
+
+* [BC] Removing 'path' support in service descriptions.  Use 'uri'.
+* [BC] Guzzle\Service\Inspector::parseDocBlock is now protected. Adding getApiParamsForClass() with cache.
+* [BC] Removing Guzzle\Common\NullObject.  Use https://github.com/mtdowling/NullObject if you need it.
+* [BC] Removing Guzzle\Common\XmlElement.
+* All commands, both dynamic and concrete, have ApiCommand objects.
+* Adding a fix for CurlMulti so that if all of the connections encounter some sort of curl error, then the loop exits.
+* Adding checks to EntityEnclosingRequest so that empty POST files and fields are ignored.
+* Making the method signature of Guzzle\Service\Builder\ServiceBuilder::factory more flexible.
+
+## 2.6.0 - 2012-05-15
+
+* [BC] Moving Guzzle\Service\Builder to Guzzle\Service\Builder\ServiceBuilder
+* [BC] Executing a Command returns the result of the command rather than the command
+* [BC] Moving all HTTP parsing logic to Guzzle\Http\Parsers. Allows for faster C implementations if needed.
+* [BC] Changing the Guzzle\Http\Message\Response::setProtocol() method to accept a protocol and version in separate args.
+* [BC] Moving ResourceIterator* to Guzzle\Service\Resource
+* [BC] Completely refactored ResourceIterators to iterate over a cloned command object
+* [BC] Moved Guzzle\Http\UriTemplate to Guzzle\Http\Parser\UriTemplate\UriTemplate
+* [BC] Guzzle\Guzzle is now deprecated
+* Moving Guzzle\Common\Guzzle::inject to Guzzle\Common\Collection::inject
+* Adding Guzzle\Version class to give version information about Guzzle
+* Adding Guzzle\Http\Utils class to provide getDefaultUserAgent() and getHttpDate()
+* Adding Guzzle\Curl\CurlVersion to manage caching curl_version() data
+* ServiceDescription and ServiceBuilder are now cacheable using similar configs
+* Changing the format of XML and JSON service builder configs.  Backwards compatible.
+* Cleaned up Cookie parsing
+* Trimming the default Guzzle User-Agent header
+* Adding a setOnComplete() method to Commands that is called when a command completes
+* Keeping track of requests that were mocked in the MockPlugin
+* Fixed a caching bug in the CacheAdapterFactory
+* Inspector objects can be injected into a Command object
+* Refactoring a lot of code and tests to be case insensitive when dealing with headers
+* Adding Guzzle\Http\Message\HeaderComparison for easy comparison of HTTP headers using a DSL
+* Adding the ability to set global option overrides to service builder configs
+* Adding the ability to include other service builder config files from within XML and JSON files
+* Moving the parseQuery method out of Url and on to QueryString::fromString() as a static factory method.
+
+## 2.5.0 - 2012-05-08
+
+* Major performance improvements
+* [BC] Simplifying Guzzle\Common\Collection.  Please check to see if you are using features that are now deprecated.
+* [BC] Using a custom validation system that allows a flyweight implementation for much faster validation. No longer using Symfony2 Validation component.
+* [BC] No longer supporting "{{ }}" for injecting into command or UriTemplates.  Use "{}"
+* Added the ability to passed parameters to all requests created by a client
+* Added callback functionality to the ExponentialBackoffPlugin
+* Using microtime in ExponentialBackoffPlugin to allow more granular backoff strategies.
+* Rewinding request stream bodies when retrying requests
+* Exception is thrown when JSON response body cannot be decoded
+* Added configurable magic method calls to clients and commands.  This is off by default.
+* Fixed a defect that added a hash to every parsed URL part
+* Fixed duplicate none generation for OauthPlugin.
+* Emitting an event each time a client is generated by a ServiceBuilder
+* Using an ApiParams object instead of a Collection for parameters of an ApiCommand
+* cache.* request parameters should be renamed to params.cache.*
+* Added the ability to set arbitrary curl options on requests (disable_wire, progress, etc.). See CurlHandle.
+* Added the ability to disable type validation of service descriptions
+* ServiceDescriptions and ServiceBuilders are now Serializable

Some files were not shown because too many files changed in this diff