Merge pull request #24 from wmde/extract-interface

Modularize code and update dependencies

Author: moiikana

.gitignore

@@ -1,3 +1,4 @@
 .idea/
 /vendor/
-.phpunit.result.cache
+.phpunit.result.cache
+.phpunit.cache

.travis.yml

@@ -3,7 +3,7 @@ language: php
 matrix:
   fast_finish: true
   include:
-  - php: 8.0
+  - php: 8.1
 
 sudo: false
 

README.md

@@ -1,17 +1,19 @@
 # fundraising-content-provider
 
-[![Build Status](https://travis-ci.org/wmde/fundraising-content-provider.svg?branch=master)](https://travis-ci.org/wmde/fundraising-content-provider)
-
 A wrapper around [htmlpurifier](http://htmlpurifier.org) and [twig](https://github.com/twigphp/Twig) 
 to purify [fundraising-frontend-content](https://github.com/wmde/fundraising-frontend-content) content 
 before rendering it into [FundraisingFrontend](https://github.com/wmde/FundraisingFrontend/).
 
 # Using fundraising-frontend-content inside FundraisingFrontend
 
-    $contentProvider = new ContentProvider( ['content_path' => '/my/fundraising-frontend-content'] );
-    // contents of fundraising-frontend-content/web & fundraising-frontend-content/shared
+    $contentProvider = TwigContentProviderFactory::createContentProvider(
+		new TwigContentProviderConfig( '/my/fundraising-frontend-content/i18n/LOCALE/' )
+	);
+
+    // get contents of fundraising-frontend-content/web & fundraising-frontend-content/shared
     $contentProvider->getWeb('template_name');
-    // contents of fundraising-frontend-content/mail & fundraising-frontend-content/shared
+    
+	// get contents of fundraising-frontend-content/mail & fundraising-frontend-content/shared
     $contentProvider->getMail('template_name');
 
 # Running lints
@@ -26,23 +28,10 @@ before rendering it into [FundraisingFrontend](https://github.com/wmde/Fundraisi
 
 # Development
 
-## Run phpunit tests
+## Run PHPUnit tests
 
     docker run -it --rm --user $(id -u):$(id -g) -v "$PWD":/app -w /app
 	php:8.0-alpine ./vendor/bin/phpunit
 
 (you have to have docker installed for this to work)
 
-# Release notes
-
-## Version 2.0 (2017-04-28)
-
-* Content is no longer purified when loading it (purifying broke twig templates)
-* renamed linter & added twig syntax checks
-* Also allowing the following HTML tags: `hr`, `u`
-* Also allowing `target="_blank"` attribute links (`a`)
-
-## Version 1.0 (2017-04-26)
-
-* Initial Release
-* Providing a service that loads and purifies (some paths) templates, returns content

composer.json

@@ -1,16 +1,16 @@
 {
     "name": "wmde/fundraising-content-provider",
     "description": "WMDE fundraising application content provider and filter",
-    "license": "GPL-2.0+",
+    "license": "GPL-2.0-or-later",
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "ezyang/htmlpurifier": "^4.9",
-        "twig/twig": "~3.0",
+        "twig/twig": "~3.4",
         "symfony/console": "^5.4 || ^6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~9.5",
-        "wmde/fundraising-phpcs": "~5.0",
+        "phpunit/phpunit": "~10.0",
+        "wmde/fundraising-phpcs": "~7.0",
         "mikey179/vfsstream": "^1.6"
     },
     "repositories": [