Merge pull request #6 from Rpsl/5-security-alerts

- Migrate to php 7.4 - Fix security alerts in dependencies - Refactoring test (remove http mock server)
Rpsl · Dec 6, 2019 · 86a202b · 86a202b
2 parents b734277 + 519c27a
commit 86a202b
Show file tree

Hide file tree

Showing 10 changed files with 1,390 additions and 3,323 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -3,4 +3,5 @@ downloads/
 cookie*
 .idea
 .git
-vendor
+vendor
+.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ downloads/
 cookie.*
 .idea
 /vendor/
-.env
+.env
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: php
 php:
   - '7.3'
+  - '7.4'
 
 install:
   - travis_retry composer self-update && composer --version

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-cli
+FROM php:7.4-cli
 
 WORKDIR /app
 COPY . /app

diff --git a/Makefile b/Makefile
@@ -2,4 +2,10 @@ phpstan:
 	php ./vendor/bin/phpstan analyse -l 7 ./src
 
 test:
-	php ./vendor/bin/phpunit -c phpunit.xml ./tests/
+	php ./vendor/bin/phpunit -c phpunit.xml ./tests/
+
+docker-build:
+	docker build -t soap4me:latest .
+
+docker-attach:
+	docker run --rm -it --name soap4me -v $(shell pwd):/app/ --entrypoint /bin/bash soap4me:latest
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
 
 - Автоматически скачивать серии в максимальном качестве 
 - Уведомлять об успешной закачке на почту
-- Раскладывать сериалы по папкам: `/Soap4.me/American Dad/Season1/s01e02 Episod Name.mp4`
+- Раскладывать сериалы по папкам: `/Soap4.me/American Dad/Season1/s01e02 Episode Name.mp4`
 
 # Настройка
 

diff --git a/composer.json b/composer.json
@@ -22,10 +22,8 @@
         "ext-json": "*"
     },
     "require-dev": {
-        "kherge/box": "^2.7",
         "phpstan/phpstan": "^0.11.17",
         "phpstan/phpstan-strict-rules": "^0.11.1",
-        "phpunit/phpunit": "^8",
-        "internations/http-mock": "^0.12.1"
+        "phpunit/phpunit": "^8"
     }
-}
+}