From d65435741e14814b49109dcfbb5b22ac3465aa53 Mon Sep 17 00:00:00 2001
From: Donald Tyler <domhnall.tilliere@gmail.com>
Date: Thu, 19 Aug 2021 15:47:49 -0500
Subject: [PATCH] Clean up PHP runtime (#55)

* Remove phpunit symlink from ./bin

* Switch to chekote/php:7-phpunit5 across the board

* Remove Dockerfile for chekote/noun-store-php
---
 .circleci/config.yml  |  4 ++--
 bin/php               |  2 +-
 bin/phpunit           |  1 -
 docker/php/Dockerfile | 17 -----------------
 4 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 120000 bin/phpunit
 delete mode 100644 docker/php/Dockerfile

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 49ac0f7..8cf8794 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: chekote/noun-store-php:2020-05-11
+      - image: chekote/php:7-phpunit5
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -37,7 +37,7 @@ jobs:
 
       - run:
           name: PHPUnit Tests
-          command: php -d xdebug.mode=coverage ./bin/phpunit --coverage-clover=coverage.clover
+          command: php -d xdebug.mode=coverage ./vendor/bin/phpunit --coverage-clover=coverage.clover
 
       - run:
           name: Upload code coverage to Codecov
diff --git a/bin/php b/bin/php
index 802929e..753daf4 100755
--- a/bin/php
+++ b/bin/php
@@ -12,4 +12,4 @@ docker run \
     ${TTY} \
     -v $(pwd):/workdir \
     -v ~/.composer:/home/user/.composer \
-    chekote/noun-store-php:2020-05-11 php "$@"
+    chekote/php:7-phpunit5 php "$@"
diff --git a/bin/phpunit b/bin/phpunit
deleted file mode 120000
index c5dcca5..0000000
--- a/bin/phpunit
+++ /dev/null
@@ -1 +0,0 @@
-../vendor/bin/phpunit
\ No newline at end of file
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
deleted file mode 100644
index 6d33af5..0000000
--- a/docker/php/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# chekote/noun-store-php
-FROM chekote/php:7-phpunit5
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends --no-install-suggests \
-        #
-        # Guzzle requirements. See http://docs.guzzlephp.org/en/stable/overview.html#requirements
-        php${PHP_VERSION}-curl \
-        #
-        # CircleCI Requirements
-        ssh && \
-    #
-    # Cleanup
-    apt-get autoremove -y && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /var/cache/apt/*