Merge pull request #2 from vdhicts/feature/update

Update to PHP 7.4

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ""
+labels: bug
+assignees: vdhicts
+
+---
+
+## Describe the bug
+
+A clear and concise description of what the bug is.
+
+## Reproduction
+
+Steps to reproduce the behavior.
+
+## Expected behavior
+
+A clear and concise description of what you expected to happen.
+
+## Actual behavior
+
+Describe the behavior as it is right now.
+
+## Additional information
+
+Anything else you want to provide.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,16 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ""
+labels: feature
+assignees: vdhicts
+
+---
+
+## Goal
+
+A clear and concise description of what the problem is. Ex. I think this could be easier when...
+
+## Additional information
+
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,3 @@
+# Changes
+
+Provide a summary of your changes.

.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: CI
+
+on: [push]
+
+jobs:
+    tests:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v1
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v1
+              with:
+                  php-version: '7.4'
+                  extensions: mbstring, intl
+
+            - name: Install Dependencies
+              run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress
+
+            - name: Execute tests (Unit and Feature tests) via PHPUnit
+              run: |
+                  vendor/bin/phpunit
+
+            - name: Execute static analysis
+              run: |
+                  vendor/bin/psalm
+

.gitignore

@@ -1,151 +1,5 @@
-# Based on https://github.com/github/gitignore/tree/master/Global
-
-################################################################################
-#
-# Ignore all dot-files and dot-folders, except .htaccess and .gitignore
-#
-################################################################################
-.*
-!/.gitignore
-!/.htaccess
-
-################################################################################
-#
-# JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion
-#
-################################################################################
-*.iml
-.idea/
-
-## File-based project format:
-*.ipr
-*.iws
-
-# Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-
-################################################################################
-#
-# Netbeans
-#
-################################################################################
-
-nbproject/
-build/
-nbbuild/
-dist/
-nbdist/
-nbactions.xml
-nb-configuration.xml
-.nb-gradle/
-
-################################################################################
-#
-# Windows OS
-#
-################################################################################
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-################################################################################
-#
-# Notepad++
-#
-################################################################################
-
-*.bak
-
-################################################################################
-#
-# Vagrant
-#
-################################################################################
-
-.vagrant/
-
-################################################################################
-#
-# TortoiseGit
-#
-################################################################################
-
-# Project-level settings
-/.tgitconfig
-
-################################################################################
-#
-# NodeJS
-#
-################################################################################
-
-# Logs
-logs
-*.log
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
-node_modules
-
-################################################################################
-#
-# Composer
-#
-################################################################################
-
-composer.phar
-vendor/
-
-# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
-# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
 composer.lock
-.gitignore
+/vendor/
+/.idea/
+/build/
+.phpunit.result.cache

CHANGELOG.md

@@ -5,17 +5,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to 
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.0.0] - 2021-09-14
+
+### Changed
+
+- The minimal required PHP version is bumped to PHP 7.4.
+- Changed the namespace to `Vdhicts\Replacer`.
+
 ## [2.0.0] - 2019-12-11
 
 ### Added
+
 - Add this changelog to this package.
 
 ### Changed
+
 - Change `setOpenDelimiter` and `setCloseDelimiter` to be fluent.
 - Move the `data` parameter to the `process` method so multiple templates can be rendered with the same `Replacer` 
 instance.
 
 ## [1.0.0] - 2018-02-19
 
 ### Added
+
 - Initial release

README.md

@@ -4,7 +4,7 @@ This package allows you to easily replace values in text for templating purposes
 
 ## Requirements
 
-This package requires PHP 7.0+.
+This package requires PHP 7.4+.
 
 ## Installation
 
@@ -61,15 +61,14 @@ per feature. In exchange you will be credited as contributor on this page.
 
 ## Security
 
-If you discover any security related issues in this or other packages of Vdhicts, please email info@vdhicts.nl instead
-of using the issue tracker.
+If you discover any security related issues in this or other packages of Vdhicts, please email security@vdhicts.nl 
+instead of using the issue tracker.
 
 ## License
 
 This package is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
 
 ## About vdhicts
 
-[Van der Heiden ICT services](https://www.vdhicts.nl) is the name of my personal company for which I work as 
-freelancer. Van der Heiden ICT services develops and implements IT solutions for businesses and educational 
-institutions.
+[Vdhicts](https://www.vdhicts.nl) is the name of my personal company. Vdhicts develops and implements IT solutions for
+businesses and educational institutions.

composer.json

@@ -12,14 +12,24 @@
     ],
     "autoload": {
         "psr-4": {
-            "Vdhicts\\Dicms\\Replacer\\": "src/"
+            "Vdhicts\\Replacer\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Vdhicts\\Replacer\\Test\\": "tests/"
         }
     },
     "require": {
-        "php" : "~7.0"
+        "php" : "^7.4|^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.1"
+        "phpunit/phpunit": "^9.0",
+        "vimeo/psalm": "^4.10"
+    },
+    "scripts": {
+        "test": "vendor/bin/phpunit",
+        "analyse": "vendor/bin/psalm"
     },
     "config": {
         "sort-packages": true

phpunit.xml

@@ -1,25 +1,29 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        bootstrap="vendor/autoload.php"
+        backupGlobals="false"
+        backupStaticAttributes="false"
+        colors="true"
+        verbose="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        processIsolation="false"
+        stopOnFailure="false"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+        <report>
+            <html outputDirectory="build/coverage"/>
+        </report>
+    </coverage>
     <testsuites>
         <testsuite name="Unit Tests">
             <directory>tests/unit</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
-    </logging>
+    <logging/>
 </phpunit>

psalm.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="5"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>