Merge branch 'release/3.3.2'

Merge pull request #60 from Araqel/master
removed extra commas from .phpstorm.meta.php
2025-08-25 00:05:52 +02:00 · 2020-06-22 18:05:21 +03:00 · 2020-06-22 18:02:56 +03:00 · 2020-06-22 18:53:58 +04:00 · 2020-04-01 16:33:45 +03:00 · 2020-04-01 16:33:45 +03:00
2 changed files with 3 additions and 3 deletions
--- a/.phpstorm.meta.php
+++ b/.phpstorm.meta.php
@@ -82,7 +82,7 @@ namespace PHPSTORM_META {
        \PhpZip\Constants\DosCodePage::CP_NORDIC,
        \PhpZip\Constants\DosCodePage::CP_CYRILLIC_RUSSIAN,
        \PhpZip\Constants\DosCodePage::CP_GREEK2,
-        \PhpZip\Constants\DosCodePage::CP_THAI,
+        \PhpZip\Constants\DosCodePage::CP_THAI
    );
    expectedArguments(\PhpZip\Model\ZipEntry::setCharset(), 0, argumentsSet('dos_charset'));
    expectedArguments(\PhpZip\Constants\DosCodePage::toUTF8(), 1, argumentsSet('dos_charset'));
@@ -92,7 +92,7 @@ namespace PHPSTORM_META {
        "zip_os",
        \PhpZip\Constants\ZipPlatform::OS_UNIX,
        \PhpZip\Constants\ZipPlatform::OS_DOS,
-        \PhpZip\Constants\ZipPlatform::OS_MAC_OSX,
+        \PhpZip\Constants\ZipPlatform::OS_MAC_OSX
    );
    expectedArguments(\PhpZip\Model\ZipEntry::setCreatedOS(), 0, argumentsSet('zip_os'));
    expectedArguments(\PhpZip\Model\ZipEntry::setExtractedOS(), 0, argumentsSet('zip_os'));
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
        "php": "^5.5.9 || ^7.0",
        "ext-zlib": "*",
        "psr/http-message": "^1.0",
-        "paragonie/random_compat": ">=1 <9.99",
+        "paragonie/random_compat": "*",
        "symfony/finder": "^3.0|^4.0|^5.0"
    },
    "require-dev": {
Author	SHA1	Message	Date
wapplay	391a55f378	Merge branch 'release/3.3.2'	2020-06-22 18:05:21 +03:00
Ne-Lexa	f503fc164e	Merge pull request #60 from Araqel/master removed extra commas from .phpstorm.meta.php	2020-06-22 18:02:56 +03:00
Araqel Araqelyan	8ce666fb5e	removed extra commas from .phpstorm.meta.php	2020-06-22 18:53:58 +04:00
wapplay	52ce79d4d2	Merge branch 'release/3.3.1'	2020-04-01 16:33:45 +03:00
wapplay	3942bf2005	Merge tag '3.3.1' into develop Tagging version 3.3.1 3.3.1	2020-04-01 16:33:45 +03:00
Ne-Lexa	decf4f5095	Merge pull request #47 from chx/chx-patch-1 Do not pin random_compat version	2020-04-01 16:29:06 +03:00
chx	70d8b8200b	Do not pin random_compat version	2020-03-23 09:49:26 -07:00
Ne-Lexa	74c0a49057	Merge tag '3.3.0' into develop Tagging version 3.3.0 3.3.0	2020-02-04 12:01:18 +03:00