stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-06 23:21:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

changes to get tests passing with PHP 8

Browse Source
This commit is contained in:
Brad Dutton
2021-04-23 14:33:53 -07:00
parent de522cd27e
commit c89e28f2d1
6 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/tests/File_Structure_Test.php
+4 -4
View File
@@ -25,7 +25,7 @@ class File_Structure_Test extends Gallery_Unit_Test_Case {
new RecursiveIteratorIterator(new RecursiveDirectoryIterator(DOCROOT)));
$count = 0;
foreach ($dir as $file) {
if (preg_match("/vendor/", $file)) continue;
if (preg_match("#(vendor|test)/#", $file)) continue;
$count++;
if (!preg_match("|\.html\.php$|", $file->getPathname())) {
@@ -59,7 +59,7 @@ class File_Structure_Test extends Gallery_Unit_Test_Case {
$dir = new GalleryCodeFilterIterator(
new RecursiveIteratorIterator(new RecursiveDirectoryIterator(DOCROOT)));
foreach ($dir as $file) {
if (preg_match("/vendor/", $file)) {
if (preg_match("#(vendor|test)/#", $file)) {
continue;
} elseif (preg_match("/\.(php|css|html|js)$/", $file)) {
foreach (file($file) as $line) {
@@ -190,7 +190,7 @@ class File_Structure_Test extends Gallery_Unit_Test_Case {
break;
default:
if (preg_match("/vendor/", $path)) {
if (preg_match("#(vendor|test)/#", $path)) {
# including unmodified 3rd party code
} elseif (preg_match("/modules\/(autorotate|movie_resized)/", $path)) {
# including unmodified 3rd party code
@@ -335,7 +335,7 @@ class File_Structure_Test extends Gallery_Unit_Test_Case {
new RecursiveIteratorIterator(new RecursiveDirectoryIterator(DOCROOT)));
$errors = "";
foreach ($dir as $file) {
if (preg_match("/vendor/", $file)) {
if (preg_match("#(vendor|test)/#", $file)) {
continue;
} elseif (preg_match("/\.(php|css|html|js)$/", $file)) {
foreach (file($file) as $line_num => $line) {