Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #332 from marc1706/ticket/331

Browse Source 
[ticket/331] Add EPV check to travis builds
This commit is contained in:
Marc Alexander
2014-08-17 18:20:07 +02:00
parent 3fa1e7c745 555b02fd16
commit c89d0c0d4f
21 changed files with 367 additions and 6392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -32,6 +32,8 @@ env:
- SNIFF="1" # Should we run code sniffer on your code?
- IMAGE_ICC="0" # Should we run icc profile sniffer on your images?
- COVERALLS="1" # Should we run coveralls?
- EPV="1" # Should we run EPV (Extension Pre Validator) on your code?
- SPELLCHECK="1" # Should the php files be checked for obvious spelling errors?
- PHPBB_BRANCH="develop-ascraeus"
branches:
@@ -57,6 +59,7 @@ script:
- sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
- sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi"
- ../board3/Board3-Portal/travis/run-testsuite.sh $DB $TRAVIS_PHP_VERSION
- sh -c "if [ '$EPV' != '0' ]; then ../board3/Board3-Portal/travis/run-epv.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
after_script:
- sh -c "if [ '$COVERALLS' != '0' ]; then ../board3/Board3-Portal/travis/run-coveralls.sh $DB $TRAVIS_PHP_VERSION; fi"

5
composer.json
View File

@@ -41,9 +41,12 @@
}],
"require": {
"php": ">=5.3.3",
"satooshi/php-coveralls": "dev-master",
"nickvergessen/phpbb-tool-trimmessage": "1.3.*"
},
"require-dev": {
"satooshi/php-coveralls": "dev-master",
"phpbb/epv": "dev-master"
},
"extra": {
"display-name": "Board3 Portal",
"soft-require": {

432
composer.lock generated
View File

@@ -4,20 +4,116 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "913c7bb36f43b871d1e5596aad308cf3",
"hash": "6322be845c2cb83f9f4e314d15157d45",
"packages": [
{
"name": "guzzle/guzzle",
"version": "v3.9.1",
"name": "nickvergessen/phpbb-tool-trimmessage",
"version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle3.git",
"reference": "92d9934f2fca1da15178c91239576ae26e505e60"
"url": "https://github.com/nickvergessen/phpbb-tool-trimmessage.git",
"reference": "2a3d8273dc1238dd06454688bcb6496f62f66c3b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle3/zipball/92d9934f2fca1da15178c91239576ae26e505e60",
"reference": "92d9934f2fca1da15178c91239576ae26e505e60",
"url": "https://api.github.com/repos/nickvergessen/phpbb-tool-trimmessage/zipball/2a3d8273dc1238dd06454688bcb6496f62f66c3b",
"reference": "2a3d8273dc1238dd06454688bcb6496f62f66c3b",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"phpunit/phpunit": "4.1.*"
},
"type": "library",
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0"
],
"authors": [
{
"name": "Joas Schilling",
"email": "nickvergessen@gmx.de",
"homepage": "https://github.com/nickvergessen",
"role": "Developer"
}
],
"description": "This tool contains a class, that is able to trim a message from the phpbb message_parser to a maximum length without breaking the bbcodes/smilies and links.",
"homepage": "https://github.com/nickvergessen/phpbb-tool-trimmessage",
"time": "2014-07-06 19:42:34"
}
],
"packages-dev": [
{
"name": "gitonomy/gitlib",
"version": "v0.1.7",
"source": {
"type": "git",
"url": "https://github.com/gitonomy/gitlib.git",
"reference": "7a46107cfb8552b312101e0d5906e95d54d7ddc6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/gitonomy/gitlib/zipball/7a46107cfb8552b312101e0d5906e95d54d7ddc6",
"reference": "7a46107cfb8552b312101e0d5906e95d54d7ddc6",
"shasum": ""
},
"require": {
"symfony/process": "~2.4"
},
"require-dev": {
"psr/log": "~1"
},
"suggest": {
"psr/log": "Add some log"
},
"type": "library",
"autoload": {
"psr-0": {
"Gitonomy\\Git": [
"src/",
"tests/"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Alexandre Salomé",
"email": "alexandre.salome@gmail.com",
"homepage": "http://alexandre-salome.fr"
},
{
"name": "Julien DIDIER",
"email": "genzo.wm@gmail.com",
"homepage": "http://www.jdidier.net"
}
],
"description": "Library for accessing git",
"homepage": "http://gitonomy.com",
"time": "2014-07-13 19:02:31"
},
{
"name": "guzzle/guzzle",
"version": "v3.9.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle3.git",
"reference": "54991459675c1a2924122afbb0e5609ade581155"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle3/zipball/54991459675c1a2924122afbb0e5609ade581155",
"reference": "54991459675c1a2924122afbb0e5609ade581155",
"shasum": ""
},
"require": {
@@ -61,7 +157,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.8-dev"
"dev-master": "3.9-dev"
}
},
"autoload": {
@@ -96,33 +192,86 @@
"rest",
"web service"
],
"time": "2014-05-07 17:04:22"
"time": "2014-08-11 04:32:36"
},
{
"name": "nickvergessen/phpbb-tool-trimmessage",
"version": "1.3.0",
"name": "nikic/php-parser",
"version": "v0.9.5",
"source": {
"type": "git",
"url": "https://github.com/nickvergessen/phpbb-tool-trimmessage.git",
"reference": "2a3d8273dc1238dd06454688bcb6496f62f66c3b"
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "ef70767475434bdb3615b43c327e2cae17ef12eb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nickvergessen/phpbb-tool-trimmessage/zipball/2a3d8273dc1238dd06454688bcb6496f62f66c3b",
"reference": "2a3d8273dc1238dd06454688bcb6496f62f66c3b",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ef70767475434bdb3615b43c327e2cae17ef12eb",
"reference": "ef70767475434bdb3615b43c327e2cae17ef12eb",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"phpunit/phpunit": "4.1.*"
"ext-tokenizer": "*",
"php": ">=5.2"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "0.9-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
"psr-0": {
"PHPParser": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Nikita Popov"
}
],
"description": "A PHP parser written in PHP",
"keywords": [
"parser",
"php"
],
"time": "2014-07-23 18:24:17"
},
{
"name": "phpbb/epv",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/phpbb/epv.git",
"reference": "4122e7329b683ac253ad99a90d1415e2ec83eb3a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpbb/epv/zipball/4122e7329b683ac253ad99a90d1415e2ec83eb3a",
"reference": "4122e7329b683ac253ad99a90d1415e2ec83eb3a",
"shasum": ""
},
"require": {
"gitonomy/gitlib": "0.1.*@dev",
"nikic/php-parser": "0.9.*@dev",
"php": ">=5.3.3",
"symfony/console": ">=2.3.0",
"symfony/finder": ">=2.3.0",
"symfony/yaml": ">=2.3.0|>=2.4.0|>=2.5.0"
},
"require-dev": {
"phpunit/phpunit": "4.0.*"
},
"bin": [
"src/EPV.php"
],
"type": "library",
"autoload": {
"psr-4": {
"Phpbb\\Epv\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -130,15 +279,12 @@
],
"authors": [
{
"name": "Joas Schilling",
"email": "nickvergessen@gmx.de",
"homepage": "https://github.com/nickvergessen",
"role": "Developer"
"name": "Paul Sohier",
"email": "paul@phpbb.com"
}
],
"description": "This tool contains a class, that is able to trim a message from the phpbb message_parser to a maximum length without breaking the bbcodes/smilies and links.",
"homepage": "https://github.com/nickvergessen/phpbb-tool-trimmessage",
"time": "2014-07-06 19:42:34"
"description": "A extension validator for phpBB extensions. Extensions are required to pass the validator when submitted to the extension database.",
"time": "2014-08-16 16:29:34"
},
{
"name": "psr/log",
@@ -184,12 +330,12 @@
"source": {
"type": "git",
"url": "https://github.com/satooshi/php-coveralls.git",
"reference": "cad73f9122027d15a43968f862cf2958e2ac5f7a"
"reference": "94389a0ebdb64857d6899b5e0254dffa99e5aa96"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/cad73f9122027d15a43968f862cf2958e2ac5f7a",
"reference": "cad73f9122027d15a43968f862cf2958e2ac5f7a",
"url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/94389a0ebdb64857d6899b5e0254dffa99e5aa96",
"reference": "94389a0ebdb64857d6899b5e0254dffa99e5aa96",
"shasum": ""
},
"require": {
@@ -251,21 +397,21 @@
"github",
"test"
],
"time": "2014-06-24 23:45:40"
"time": "2014-07-09 10:45:38"
},
{
"name": "symfony/config",
"version": "v2.5.0",
"version": "v2.5.3",
"target-dir": "Symfony/Component/Config",
"source": {
"type": "git",
"url": "https://github.com/symfony/Config.git",
"reference": "9c8caadb38ecc69ac35ab31af4d1996944b5a09f"
"reference": "8d044668c7ccb4ade684e368d910e3aadcff6f6c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Config/zipball/9c8caadb38ecc69ac35ab31af4d1996944b5a09f",
"reference": "9c8caadb38ecc69ac35ab31af4d1996944b5a09f",
"url": "https://api.github.com/repos/symfony/Config/zipball/8d044668c7ccb4ade684e368d910e3aadcff6f6c",
"reference": "8d044668c7ccb4ade684e368d910e3aadcff6f6c",
"shasum": ""
},
"require": {
@@ -288,34 +434,32 @@
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Symfony Config Component",
"homepage": "http://symfony.com",
"time": "2014-04-22 08:11:23"
"time": "2014-08-05 09:00:40"
},
{
"name": "symfony/console",
"version": "v2.5.0",
"version": "v2.5.3",
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
"reference": "ef4ca73b0b3a10cbac653d3ca482d0cdd4502b2c"
"reference": "cd2d1e4bac2206b337326b0140ff475fe9ad5f63"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Console/zipball/ef4ca73b0b3a10cbac653d3ca482d0cdd4502b2c",
"reference": "ef4ca73b0b3a10cbac653d3ca482d0cdd4502b2c",
"url": "https://api.github.com/repos/symfony/Console/zipball/cd2d1e4bac2206b337326b0140ff475fe9ad5f63",
"reference": "cd2d1e4bac2206b337326b0140ff475fe9ad5f63",
"shasum": ""
},
"require": {
@@ -345,34 +489,32 @@
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Symfony Console Component",
"homepage": "http://symfony.com",
"time": "2014-05-22 08:54:24"
"time": "2014-08-05 09:00:40"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.5.0",
"version": "v2.5.3",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
"reference": "cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8"
"reference": "8faf5cc7e80fde74a650a36e60d32ce3c3e0457b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8",
"reference": "cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/8faf5cc7e80fde74a650a36e60d32ce3c3e0457b",
"reference": "8faf5cc7e80fde74a650a36e60d32ce3c3e0457b",
"shasum": ""
},
"require": {
@@ -404,34 +546,32 @@
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
"time": "2014-04-29 10:13:57"
"time": "2014-07-28 13:20:46"
},
{
"name": "symfony/filesystem",
"version": "v2.5.0",
"version": "v2.5.3",
"target-dir": "Symfony/Component/Filesystem",
"source": {
"type": "git",
"url": "https://github.com/symfony/Filesystem.git",
"reference": "98e831eac836a0a5911626ce82684155f21d0e4d"
"reference": "c1309b0ee195ad264a4314435bdaecdfacb8ae9c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Filesystem/zipball/98e831eac836a0a5911626ce82684155f21d0e4d",
"reference": "98e831eac836a0a5911626ce82684155f21d0e4d",
"url": "https://api.github.com/repos/symfony/Filesystem/zipball/c1309b0ee195ad264a4314435bdaecdfacb8ae9c",
"reference": "c1309b0ee195ad264a4314435bdaecdfacb8ae9c",
"shasum": ""
},
"require": {
@@ -453,34 +593,126 @@
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Symfony Filesystem Component",
"homepage": "http://symfony.com",
"time": "2014-04-16 10:36:21"
"time": "2014-07-09 09:05:48"
},
{
"name": "symfony/finder",
"version": "v2.5.3",
"target-dir": "Symfony/Component/Finder",
"source": {
"type": "git",
"url": "https://github.com/symfony/Finder.git",
"reference": "090fe4eaff414d8f2171c7a4748ea868d530775f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Finder/zipball/090fe4eaff414d8f2171c7a4748ea868d530775f",
"reference": "090fe4eaff414d8f2171c7a4748ea868d530775f",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.5-dev"
}
},
"autoload": {
"psr-0": {
"Symfony\\Component\\Finder\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Symfony Finder Component",
"homepage": "http://symfony.com",
"time": "2014-07-28 13:20:46"
},
{
"name": "symfony/process",
"version": "v2.5.3",
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
"reference": "e0997d2a9a1a763484b34b989900b61322a9b056"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Process/zipball/e0997d2a9a1a763484b34b989900b61322a9b056",
"reference": "e0997d2a9a1a763484b34b989900b61322a9b056",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.5-dev"
}
},
"autoload": {
"psr-0": {
"Symfony\\Component\\Process\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Symfony Process Component",
"homepage": "http://symfony.com",
"time": "2014-08-05 09:00:40"
},
{
"name": "symfony/stopwatch",
"version": "v2.5.0",
"version": "v2.5.3",
"target-dir": "Symfony/Component/Stopwatch",
"source": {
"type": "git",
"url": "https://github.com/symfony/Stopwatch.git",
"reference": "724d73604ebe6c1c9bdf36533b556123bd9075a1"
"reference": "086c8c98c3016f59f5e6e7b15b751c2384b311e5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Stopwatch/zipball/724d73604ebe6c1c9bdf36533b556123bd9075a1",
"reference": "724d73604ebe6c1c9bdf36533b556123bd9075a1",
"url": "https://api.github.com/repos/symfony/Stopwatch/zipball/086c8c98c3016f59f5e6e7b15b751c2384b311e5",
"reference": "086c8c98c3016f59f5e6e7b15b751c2384b311e5",
"shasum": ""
},
"require": {
@@ -502,34 +734,32 @@
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Symfony Stopwatch Component",
"homepage": "http://symfony.com",
"time": "2014-04-18 20:40:13"
"time": "2014-08-06 06:44:37"
},
{
"name": "symfony/yaml",
"version": "v2.5.0",
"version": "v2.5.3",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
"reference": "b4b09c68ec2f2727574544ef0173684281a5033c"
"reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Yaml/zipball/b4b09c68ec2f2727574544ef0173684281a5033c",
"reference": "b4b09c68ec2f2727574544ef0173684281a5033c",
"url": "https://api.github.com/repos/symfony/Yaml/zipball/5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f",
"reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f",
"shasum": ""
},
"require": {
@@ -551,31 +781,27 @@
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
"time": "2014-05-16 14:25:18"
"time": "2014-08-05 09:00:40"
}
],
"packages-dev": [
],
"aliases": [
],
"minimum-stability": "stable",
"stability-flags": {
"satooshi/php-coveralls": 20
"satooshi/php-coveralls": 20,
"phpbb/epv": 20
},
"platform": {
"php": ">=5.3.3"

4256
develop/misspellings.json
View File

File diff suppressed because it is too large Load Diff

1898
develop/misspellings_de.json
View File

File diff suppressed because it is too large Load Diff

113
develop/spellchecker.php
View File

@@ -1,113 +0,0 @@
<?php
/**
*
* @package Board3 Portal v2.1
* @copyright (c) 2014 Board3 Group ( www.board3.de )
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
* This file checks the spelling in language files.
*/
$root_path = dirname(__FILE__) . '/../';
$spellings = json_decode(file_get_contents($root_path . 'develop/misspellings.json'), true);
$spellings_de = json_decode(file_get_contents($root_path . 'develop/misspellings_de.json'), true);
$output = '';
// Cycle through all files
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root_path, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS), \RecursiveIteratorIterator::SELF_FIRST);
foreach ($iterator as $file_info)
{
$file_path = $file_info->getPath();
$file = $file_info->getFilename();
if ($file === 'spellchecker.php')
{
continue;
}
if (file_exists($file_path . '/' . $file) && preg_match('/.+\.(?:(php))$/', $file))
{
$content = file_get_contents($file_path . '/' . $file);
if (!empty($content))
{
// English files and php files
if (!preg_match('/(?:(\/language\/de))/', $file_path))
{
$found_misspellings = array();
foreach ($spellings as $misspell => $correct)
{
if (preg_match('/\b(?:(' . $misspell . '))\b/', $content) != false)
{
$found_misspellings[$misspell] = $correct;
}
}
if (!empty($found_misspellings))
{
$lines = file($file_path . '/' . $file);
foreach ($spellings as $misspell => $correct)
{
if (!isset($found_misspellings[$misspell]))
{
$continue;
}
foreach ($lines as $line_no => $line)
{
if (preg_match('/\b(?:(' . $misspell . '))\b/', $line) != false)
{
$output .= "Found misspelling \"$misspell\" in " . realpath($file_path) . "/$file at Line $line_no<br />Should probably be: $correct<br /><br />";
}
}
}
}
}
else
{
$found_misspellings = array();
foreach ($spellings_de as $misspell => $correct)
{
if (preg_match('/\b(?:(' . $misspell . '))\b/', $content) != false)
{
$found_misspellings[$misspell] = $correct;
}
}
if (!empty($found_misspellings))
{
$lines = file($file_path . '/' . $file);
foreach ($spellings_de as $misspell => $correct)
{
if (!isset($found_misspellings[$misspell]))
{
$continue;
}
foreach ($lines as $line_no => $line)
{
if (preg_match('/\b(?:(' . $misspell . '))\b/', $line) != false)
{
$output .= "Found misspelling \"$misspell\" in " . realpath($file_path) . "/$file at Line $line_no<br />Should probably be: $correct<br /><br />";
}
}
}
}
}
}
}
}
if (PHP_SAPI == 'cli')
{
$output = str_replace('<br />', "\n", $output);
}
echo $output;
// Exit with 1 if script encountered issues
if (strlen($output) > 0)
{
exit(1);
}

11
includes/functions.php
View File

@@ -241,7 +241,7 @@ function generate_portal_pagination($base_url, $num_items, $per_page, $start_ite
$template->assign_vars(array(
$tpl_prefix . 'BASE_URL' => $base_url,
'A_' . $tpl_prefix . 'BASE_URL' => addslashes($base_url),
'A_' . $tpl_prefix . 'BASE_URL' => is_string($base_url) ? $base_url : '',
$tpl_prefix . 'PER_PAGE' => $per_page,
$tpl_prefix . 'PREVIOUS_PAGE' => ($on_page == 1) ? '' : $base_url . "{$url_delim}" . $pagination_type . '=' . (($on_page - 2) * $per_page) . $anker,
@@ -358,14 +358,7 @@ function get_portal_tracking_info($fetch_news)
{
if ($request->is_set($config['cookie_name'] . '_track', \phpbb\request\request_interface::COOKIE))
{
if (STRIP)
{
$tracking_topics = stripslashes($request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE));
}
else
{
$tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE);
}
$tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE);
}
else
{

2
modules/stylechanger.php
View File

@@ -108,7 +108,7 @@ class stylechanger extends module_base
$url = append_sid("{$this->phpbb_root_path}app.{$this->php_ext}/portal", 'style=' . $row['style_id']);
}
++$style_count;
$style_select .= '<option value="' . $url . '"' . ($row['style_id'] == $this->user->style['style_id'] ? ' selected="selected"' : '') . '>' . htmlspecialchars($row['style_name']) . '</option>';
$style_select .= '<option value="' . $url . '"' . ($row['style_id'] == $this->user->style['style_id'] ? ' selected="selected"' : '') . '>' . utf8_htmlspecialchars($row['style_name']) . '</option>';
}
$this->db->sql_freeresult($result);
if(strlen($style_select))

2
styles/prosilver/template/portal/modules/clock_side.html
View File

@@ -27,6 +27,6 @@
</div>
</div>
</div>
<!-- INCLUDEJS portal/modules/jquery.easing.1.3.js -->
<!-- INCLUDEJS portal/modules/jquery_easing_1_3.js -->
<!-- INCLUDEJS portal/modules/portal_clock.js -->
{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}

0
styles/prosilver/template/portal/modules/jquery.easing.1.3.js → styles/prosilver/template/portal/modules/jquery_easing_1_3.js vendored
View File

BIN
styles/prosilver/theme/images/portal/board3clock.swf
View File

Binary file not shown.

2
styles/subsilver2/template/portal/modules/clock_side.html
View File

@@ -31,6 +31,6 @@
</td>
</tr>
</table>
<!-- INCLUDEJS portal/modules/jquery.easing.1.3.js -->
<!-- INCLUDEJS portal/modules/jquery_easing_1_3.js -->
<!-- INCLUDEJS portal/modules/portal_clock.js -->
{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}

0
styles/subsilver2/template/portal/modules/jquery.easing.1.3.js → styles/subsilver2/template/portal/modules/jquery_easing_1_3.js vendored
View File

BIN
styles/subsilver2/theme/images/portal/board3clock.swf
View File

Binary file not shown.

2
tests/unit/controller/helper_test.php
View File

@@ -36,7 +36,7 @@ class helper_test extends \board3\portal\tests\testframework\test_case
'board3_enable' => true,
));
$this->template = new \board3\portal\tests\mock\template($this);
$this->user = $this->getMock('\phpbb\user', array('add_lang_ext'));
$this->user = $this->getMock('\phpbb\user', array('add_lang_ext'), array('\phpbb\datetime'));
$this->user->data['group_id'] = 2;
$this->phpbb_root_path = dirname(__FILE__) . '/../../../../../../';
$this->php_ext = 'php';

2
tests/unit/event/listener_test.php
View File

@@ -32,7 +32,7 @@ class listener_test extends \phpbb_template_template_test_case
public function setup_listener()
{
$this->user = $this->getMock('\phpbb\user');
$this->user = $this->getMock('\phpbb\user', array(), array('\phpbb\datetime'));
$this->user->expects($this->any())
->method('lang')
->will($this->returnValue('foo'));

2
tests/unit/functions/fetch_news_test.php
View File

@@ -22,7 +22,7 @@ class phpbb_functions_fetch_news_test extends \board3\portal\tests\testframework
global $auth, $cache, $config, $phpbb_container, $phpbb_dispatcher, $template, $user;
$user = new \phpbb\user();
$user = new \phpbb\user('\phpbb\datetime');
$user->data['user_id'] = 2;
$user->timezone = new \DateTimeZone('UTC');
$user->add_lang('common');

2
tests/unit/functions/functions_test.php
View File

@@ -24,7 +24,7 @@ class phpbb_unit_functions_functions_test extends \board3\portal\tests\testframe
parent::setUp();
$user = $this->getMock('\phpbb\user', array('optionget'));
$user = $this->getMock('\phpbb\user', array('optionget'), array('\phpbb\datetime'));
$cache = $this->getMock('\phpbb\cache\cache', array('obtain_word_list', 'sql_exists'));
$cache->expects($this->any())
->method('obtain_word_list')

2
tests/unit/functions/get_user_groups_test.php
View File

@@ -22,7 +22,7 @@ class phpbb_unit_functions_get_user_groups_test extends \board3\portal\tests\tes
parent::setUp();
$user = $this->getMock('\phpbb\user', array('optionget'));
$user = $this->getMock('\phpbb\user', array('optionget'), array('\phpbb\datetime'));
$cache = $this->getMock('\phpbb\cache\cache', array('get', 'put', 'sql_exists'));
$cache->expects($this->any())
->method('get')

7
tests/unit/portal/fetch_posts_test.php
View File

@@ -19,11 +19,11 @@ class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\d
public function setUp()
{
global $auth, $cache, $phpbb_dispatcher, $template, $user;;
global $auth, $cache, $phpbb_dispatcher, $template, $user;
parent::setUp();
$user = new \phpbb\user();
$user = new \phpbb\user('\phpbb\datetime');
$user->data['user_id'] = 2;
$user->timezone = new \DateTimeZone('UTC');
$user->add_lang('common');
@@ -50,8 +50,7 @@ class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\d
// Pretend to allow downloads in forum 1
$auth->acl[1][0] = true;
$this->auth = $auth;
$request = new \phpbb_mock_request;
$this->modules_helper = new \board3\portal\includes\modules_helper($auth, $this->config, $request);
$this->modules_helper = new \board3\portal\includes\modules_helper($auth, $this->config, new phpbb_mock_request());
$this->user = $user;
$template = $this->getMock('\phpbb\template', array('set_filenames', 'destroy_block_vars', 'assign_block_vars', 'assign_display'));
$this->fetch_posts = new \board3\portal\portal\fetch_posts($auth, $cache, $this->config, $this->db, $this->modules_helper, $user);

18
travis/run-epv.sh Executable file
View File

@@ -0,0 +1,18 @@
#!/bin/bash
#
# This file is part of the Board3 Portal package.
#
# @copyright (c) Board3 Group <http://www.board3.de>
# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
#
set -e
set -x
DB=$1
TRAVIS_PHP_VERSION=$2
EXTNAME=$3
if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ]
then
phpBB/ext/$EXTNAME/vendor/bin/EPV.php run --dir="phpBB/ext/$EXTNAME/"
fi