Merge pull request #4 from Zenith-Kim-Light/master

багфикс
vseinstrumentiru · Jun 10, 2020 · 8dfa085 · 8dfa085
2 parents 5e4aea5 + 3e27b32
commit 8dfa085
Show file tree

Hide file tree

Showing 4 changed files with 8,066 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,11 @@
-composer.lock
+# Vendor
+vendor
 
-###> symfony/framework-bundle ###
-/vendor/
-###< symfony/framework-bundle ###
-
-###> symfony/phpunit-bridge ###
+# PHPUnit
 .phpunit
-/phpunit.xml
-###< symfony/phpunit-bridge ###
+.phpunit.result.cache
+phpunit.xml
 
+# IDE
 .idea
 .vscode
diff --git a/composer.json b/composer.json
@@ -10,6 +10,24 @@
       "email": "shtricul@gmail.comm"
     }
   ],
+  "config": {
+    "preferred-install": {
+      "*": "dist"
+    },
+    "sort-packages": true
+  },
+  "autoload": {
+    "psr-4": {
+      "LeNats\\": "src/",
+      "GPBMetadata\\": "gen/GPBMetadata/",
+      "NatsStreamingProtocol\\": "gen/NatsStreamingProtocol/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "LeNats\\Tests\\": "tests/"
+    }
+  },
   "require": {
     "php": "^7.1.3",
     "ext-ctype": "*",
@@ -31,29 +49,12 @@
     "symfony/framework-bundle": "^3.4|^4.2",
     "symfony/yaml": "^3.4|^4.2"
   },
-  "config": {
-    "preferred-install": {
-      "*": "dist"
-    },
-    "sort-packages": true
-  },
-  "autoload": {
-    "psr-4": {
-      "LeNats\\": "src/",
-      "GPBMetadata\\": "gen/GPBMetadata/",
-      "NatsStreamingProtocol\\": "gen/NatsStreamingProtocol/"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "LeNats\\Tests\\": "tests/"
-    }
-  },
   "require-dev": {
     "phpstan/phpstan": "^0.11.2",
     "phpstan/phpstan-symfony": "^0.11.1",
     "symfony/phpunit-bridge": "^3.4|^4.2",
-    "symplify/easy-coding-standard": "^5.4"
+    "symplify/easy-coding-standard": "^5.4",
+    "phpunit/phpunit": "^8.0"
   },
   "scripts": {
     "ecs": "vendor/bin/ecs check ./src --fix",