Merge pull request #21 from silinternational/feature/PHP7.3-and-other…

…-improvements

Feature/php7.3 and other improvements

Dockerfile

@@ -1,15 +1,18 @@
-FROM silintl/php7:7.2
-MAINTAINER Mark Tompsett <[email protected]>
+FROM php:7.3-apache-buster
+LABEL maintainer="Mark Tompsett <[email protected]>"
 
-ENV REFRESHED_AT 2020-05-07
-
-# Fix timezone stuff from hanging.
-RUN apt-get update -y && echo "America/New_York" > /etc/timezone; \
-    apt-get install -y tzdata
+ENV REFRESHED_AT 2021-03-24
 
 # Make sure apt has current list/updates
+RUN apt-get update -y \
+# Fix timezone stuff from hanging.
+    && echo "Etc/UTC" > /etc/timezone \
+    && apt-get install -y tzdata \
 # Install necessary PHP building blocks
-RUN apt-get install -y zip unzip make curl wget php
+    && apt-get install -y zip unzip make curl wget \
+# Clean up to reduce docker image size
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p /data
 WORKDIR /data

README.md

@@ -18,6 +18,6 @@ Various PSR3-compatible logging adapters.
 - This writes to stdout, bypassing any output buffering that PHP might be doing.
 
 ### Psr3Yii2Logger
-- Make sure your Yii config bootstraps the `log` componenet. In other words,
+- Make sure your Yii config bootstraps the `log` component. In other words,
   include something like this in your Yii config:
   `'bootstrap' => ['log']`

composer.json

@@ -11,11 +11,11 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.0",
         "psr/log": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0",
+        "phpunit/phpunit": "^9.0",
         "roave/security-advisories": "dev-master",
         "monolog/monolog": "^1.22",
         "simplesamlphp/simplesamlphp": "^1.15.2",
@@ -31,5 +31,11 @@
             "Sil\\Psr3Adapters\\": "src/",
             "Sil\\Psr3Adapters\\tests\\": "tests/"
         }
-    }
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        }
+    ]
 }