Merge pull request #83 from thunderer/php-7.4

PHP 7.4

Author: thunderer

.travis.yml

@@ -1,3 +1,4 @@
+dist: trusty
 language: php
 
 php:
@@ -9,6 +10,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4snapshot
   - hhvm
   - nightly
 

Makefile

@@ -1,4 +1,4 @@
-PHP ?= 7.3
+PHP ?= 7.4
 
 composer-update:
 	docker-compose run --rm composer composer config platform.php ${PHP}

docker-compose.yaml

@@ -17,3 +17,4 @@ services:
   php-7.1: { image: 'php:7.1', volumes: ['.:/app'] }
   php-7.2: { image: 'php:7.2', volumes: ['.:/app'] }
   php-7.3: { image: 'php:7.3', volumes: ['.:/app'] }
+  php-7.4: { image: 'php:7.4', volumes: ['.:/app'] }

src/Processor/Processor.php

@@ -140,7 +140,7 @@ private function processHandler(ParsedShortcodeInterface $parsed, ProcessorConte
 
         $state = $parsed->getText();
         $length = mb_strlen($processed->getTextContent(), 'utf-8');
-        $offset = mb_strrpos($state, $processed->getTextContent(), 'utf-8');
+        $offset = mb_strrpos($state, $processed->getTextContent(), 0, 'utf-8');
 
         return mb_substr($state, 0, $offset, 'utf-8').$processed->getContent().mb_substr($state, $offset + $length, mb_strlen($state, 'utf-8'), 'utf-8');
     }