mirror/Arsse
1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2024-12-22 21:22:40 +00:00
Code Issues Activity

macOS fixes

Browse source
This commit is contained in:
J. King 2017-05-21 21:49:54 -04:00
parent 97a8f473a7
commit adfb22e922
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Feed.php
View file

@ -69,7 +69,7 @@ class Feed {
// used instead of the feed's url. // used instead of the feed's url.
$this->favicon = (new Favicon)->find($feed->siteUrl); $this->favicon = (new Favicon)->find($feed->siteUrl);
} catch (PicoFeedException $e) { } catch (PicoFeedException $e) {
throw new Feed\Exception($url, $e); throw new Feed\Exception($this->resource->getUrl(), $e);
} }
// PicoFeed does not provide valid ids when there is no id element. Its solution // PicoFeed does not provide valid ids when there is no id element. Its solution

4
tests/test
View file

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
base=`dirname "$0"` base=`dirname "$0"`
php -S localhost:8000 "$base/server.php" >/dev/null & php -n -S localhost:8000 "$base/server.php" >/dev/null &
php "$base/../vendor/phpunit/phpunit/phpunit" -c "$base/phpunit.xml" php "$base/../vendor/phpunit/phpunit/phpunit" -c "$base/phpunit.xml"
sleep 1s sleep 1s
pid=`netstat -tlpn 2>/dev/null | grep ":8000 " | grep -Eo "[0-9]+/php" | grep -Eo "[0-9]+"` pid=`lsof -n -i:8000 | grep -Eo "php\s+[0-9]+" | grep -Eo "[0-9]+"`
kill $pid kill $pid

2
tests/test.bat
View file

@ -1,7 +1,7 @@
@echo off @echo off
setlocal setlocal
set base=%~dp0 set base=%~dp0
start /b php -S localhost:8000 "%base%\server.php" >nul start /b php -n -S localhost:8000 "%base%\server.php" >nul
php "%base%\..\vendor\phpunit\phpunit\phpunit" -c "%base%\phpunit.xml" php "%base%\..\vendor\phpunit\phpunit\phpunit" -c "%base%\phpunit.xml"
timeout /nobreak /t 1 >nul timeout /nobreak /t 1 >nul
for /f "usebackq tokens=5" %%a in (`netstat -aon ^| find "LISTENING" ^| find ":8000"`) do ( for /f "usebackq tokens=5" %%a in (`netstat -aon ^| find "LISTENING" ^| find ":8000"`) do (