Merge pull request #4 from Dhii/task/remove-redundant-dep

Dhii · Dec 8, 2021 · 75ed82a · 75ed82a
2 parents 03383af + bc3ce35
commit 75ed82a
Show file tree

Hide file tree

Showing 14 changed files with 489 additions and 312 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,8 +2,14 @@
 .env.example export-ignore
 docker-compose.yml export-ignore
 docker export-ignore
+composer.json export-ignore
 composer.lock export-ignore
 .gitattributes export-ignore
+.github export-ignore
+.gitignore export-ignore
+CHANGELOG.md export-ignore
+*.xml.dist export-ignore
+README.md export-ignore
 tests export-ignore
 
 * text eol=lf
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -1,5 +1,5 @@
 name: Continuous Integration
-on: [push, pull_request]
+on: [push]
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -28,7 +28,7 @@ jobs:
         run: ./vendor/bin/phpunit
 
       - name: Psalm
-        run: ./vendor/bin/psalm --show-info=false --threads=8 --diff
+        run: ./vendor/bin/psalm --show-info=true --threads=8 --diff
 
       - name: PHPCS
-        run: ./vendor/bin/phpcs -s --report-source --runtime-set ignore_warnings_on_exit 1
+        run: ./vendor/bin/phpcs --report=full --runtime-set ignore_warnings_on_exit 1
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 /.env
 
 /.idea/workspace.xml
+/.idea/shelf/
 
 /vendor/
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/versions.iml b/.idea/versions.iml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [[*next-version*]] - YYYY-MM-DD
+### Fixed
+- Remove redundant dependency (#4).
 
 ## [0.1.0-alpha2] - 2021-03-05
 ### Added

diff --git a/composer.json b/composer.json
@@ -11,13 +11,13 @@
   ],
   "require": {
     "php": "^7.1 | ^8.0",
-    "dhii/package-interface": "^0.1.0-alpha3",
-    "dhii/stringable-interface": "^0.2.0-alpha1"
+    "dhii/package-interface": "^0.1.0-alpha3"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.0 | ^8.0 | ^9.0",
     "vimeo/psalm": "^4.4.0",
-    "slevomat/coding-standard": "^6.0"
+    "slevomat/coding-standard": "^6.0",
+    "symfony/polyfill-php80": "^1.19"
   },
   "autoload": {
     "psr-4": {
@@ -28,10 +28,5 @@
     "psr-4": {
       "Dhii\\Versions\\Test\\Functional\\": "tests/func"
     }
-  },
-  "extra": {
-    "branch-alias": {
-      "dev-develop": "0.1.x-dev"
-    }
   }
 }