From 760cf66b8bac6879c81e1a311ccb3224c990e714 Mon Sep 17 00:00:00 2001 From: GenaBitu Date: Mon, 12 Mar 2018 20:09:35 +0100 Subject: [PATCH 1/7] Removed table end condition: no | --- block/.TableTrait.php.swp | Bin 0 -> 12288 bytes block/TableTrait.php | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 block/.TableTrait.php.swp diff --git a/block/.TableTrait.php.swp b/block/.TableTrait.php.swp new file mode 100644 index 0000000000000000000000000000000000000000..6ce0cf933f514004718fdd20f4ef585d2490e5be GIT binary patch literal 12288 zcmeI2&u<$=6vwCZ2Q|1ri8U#04baAK-^t@#FhucVj1UT(|*Rx1X+e z=f`{Voi}gB>Q?g49(|neAIdX)?qlrf&)%7vdEH_8rx&+i-AhINKBDcoP222O zMU|b4Iy4Ts)pk=j(l;Kn<&k#9K*@sTo_35%!>ukDvu33sWEiB89N3H@Y)utmZGKG<3I^9{5e0Jv03~!nXf}5Ol z;*M(xa&3*lX}9gjOon_<1eSS$i)Kqg;ngl5B*%(t9;+_k*%a4xxS(@2fI?E|Lwrr; zzI~v9p47<~yT()D=mRgRu0y&PBMDYN4RlcI>S=zKCGfXLoT>SpwK|%nS%ME5^bbEk z6DmBu#1h8f;L2%FPN=RYOOB>IapZ&{E3UPOC-_E_if>7BU4_7!aVwD^ZJw$mw3_Yt z61O$8;S2RhHA_Uj^PvJq)X2IpEiw_=QWlgtK^JPM=r43CXePZ$Oq zWZ#g3{?fCX(acASl2%)w_lo7=xu?_VG}^2e-pQ_5bWaIReQ@dGDmWbW@v<8CrD!Qd z0t21(@h=U`wJQh<8N!A$iZvkXY86OJ1#->xgjubpH1!HzQHN;0UgoCHHPVkFwG$1} zYpY;bHJxD)sJUMgSZYC$1EGPc+kgQIspVdfAjlV(>aik%NuH$$4xQ{;5CEo zO!QbC#lU!$=W?12+b|xif)#@Wj6O$Q5pNvDLky2417kEHnkWyVqoRhE`k^`G05<$J;|O86}42xREf->WWUT(njDg?t4}B?D@J> z5lCID`lO`hg`Td{tRZT>S~dE&s^X%DGZWiBGHkK#m6hEAh-R?CA-1qqKz)QlyT7c3t6YMoM9s5QAo zX;hqPHL#7BS5%TZF^WrGJ~j9L53X~dzm^5slAe3+T}IR zZE{~=Xcni=R8&OE!|NFFi&$gI1YCtuFtKa_r;;jd=y;^A!Fux3;~do{!a};qWCB-I zqDTZ;i5Dh$v7Dt~)M=c0_XCvxbSey@4Hk;zA%+sAa@e&S+!3dh_v@sauyUAhsHRU& z2Lg3vp6PIZP&GJ>G)zL>=_i4;-}1!#iKZ!$WA$^-mrDL1mh)7KzKl)filtHxU(5I& z7WFPjXQ&mGY3Jx{r_2^3zjy`*Det2~0)ysN$*tQS^ zc5SgsnaGcx0!8(q3z?xvrG2#`=55EZoq6uoBFTchJrpU|^6XQl6kO|Uw$Ub1q7l?`| zMJMZ$+CPvV!yXP`qzk+*Wy>EkjCotu+m)fJ+cc=v^4spakbbSEAd_f-+=NtlyEgQO zJiRZE [], 'rows' => [], ]; - $beginsWithPipe = $lines[$current][0] === '|'; for ($i = $current, $count = count($lines); $i < $count; $i++) { $line = rtrim($lines[$i]); @@ -65,7 +64,7 @@ protected function consumeTable($lines, $current) continue; } - if ($line === '' || $beginsWithPipe && $line[0] !== '|') { + if ($line === '') { break; } if ($line[0] === '|') { From 844cf08df5b560a6eefc46a3499fb8f864091f87 Mon Sep 17 00:00:00 2001 From: GenaBitu Date: Mon, 12 Mar 2018 20:17:58 +0100 Subject: [PATCH 2/7] Ending table on 4 spaces --- block/TableTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/TableTrait.php b/block/TableTrait.php index c6332b4..842855b 100644 --- a/block/TableTrait.php +++ b/block/TableTrait.php @@ -64,7 +64,7 @@ protected function consumeTable($lines, $current) continue; } - if ($line === '') { + if ($line === '' | substr($lines[i], 0, 4) === ' ') { break; } if ($line[0] === '|') { From 102b5e9473e4d47474e7a3e2a9c5c08d4d17ce69 Mon Sep 17 00:00:00 2001 From: GenaBitu Date: Mon, 12 Mar 2018 20:20:06 +0100 Subject: [PATCH 3/7] Regression fix --- block/TableTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/TableTrait.php b/block/TableTrait.php index 842855b..00c67e4 100644 --- a/block/TableTrait.php +++ b/block/TableTrait.php @@ -64,7 +64,7 @@ protected function consumeTable($lines, $current) continue; } - if ($line === '' | substr($lines[i], 0, 4) === ' ') { + if ($line === '' | substr($lines[$i], 0, 4) === ' ') { break; } if ($line[0] === '|') { From 948553a782e8272009425b90efb4781bbdffbf23 Mon Sep 17 00:00:00 2001 From: GenaBitu Date: Mon, 12 Mar 2018 20:41:42 +0100 Subject: [PATCH 4/7] Tables: Ignoring whitespace in the front --- block/TableTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/TableTrait.php b/block/TableTrait.php index 00c67e4..b793b0d 100644 --- a/block/TableTrait.php +++ b/block/TableTrait.php @@ -38,7 +38,7 @@ protected function consumeTable($lines, $current) 'rows' => [], ]; for ($i = $current, $count = count($lines); $i < $count; $i++) { - $line = rtrim($lines[$i]); + $line = trim($lines[$i]); // extract alignment from second line if ($i == $current+1) { From c64396a0d605bd2fdc2ff8aeb1582b6d17748f91 Mon Sep 17 00:00:00 2001 From: GenaBitu Date: Mon, 12 Mar 2018 20:42:43 +0100 Subject: [PATCH 5/7] Deleted accidental swp file --- block/.TableTrait.php.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 block/.TableTrait.php.swp diff --git a/block/.TableTrait.php.swp b/block/.TableTrait.php.swp deleted file mode 100644 index 6ce0cf933f514004718fdd20f4ef585d2490e5be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&u<$=6vwCZ2Q|1ri8U#04baAK-^t@#FhucVj1UT(|*Rx1X+e z=f`{Voi}gB>Q?g49(|neAIdX)?qlrf&)%7vdEH_8rx&+i-AhINKBDcoP222O zMU|b4Iy4Ts)pk=j(l;Kn<&k#9K*@sTo_35%!>ukDvu33sWEiB89N3H@Y)utmZGKG<3I^9{5e0Jv03~!nXf}5Ol z;*M(xa&3*lX}9gjOon_<1eSS$i)Kqg;ngl5B*%(t9;+_k*%a4xxS(@2fI?E|Lwrr; zzI~v9p47<~yT()D=mRgRu0y&PBMDYN4RlcI>S=zKCGfXLoT>SpwK|%nS%ME5^bbEk z6DmBu#1h8f;L2%FPN=RYOOB>IapZ&{E3UPOC-_E_if>7BU4_7!aVwD^ZJw$mw3_Yt z61O$8;S2RhHA_Uj^PvJq)X2IpEiw_=QWlgtK^JPM=r43CXePZ$Oq zWZ#g3{?fCX(acASl2%)w_lo7=xu?_VG}^2e-pQ_5bWaIReQ@dGDmWbW@v<8CrD!Qd z0t21(@h=U`wJQh<8N!A$iZvkXY86OJ1#->xgjubpH1!HzQHN;0UgoCHHPVkFwG$1} zYpY;bHJxD)sJUMgSZYC$1EGPc+kgQIspVdfAjlV(>aik%NuH$$4xQ{;5CEo zO!QbC#lU!$=W?12+b|xif)#@Wj6O$Q5pNvDLky2417kEHnkWyVqoRhE`k^`G05<$J;|O86}42xREf->WWUT(njDg?t4}B?D@J> z5lCID`lO`hg`Td{tRZT>S~dE&s^X%DGZWiBGHkK#m6hEAh-R?CA-1qqKz)QlyT7c3t6YMoM9s5QAo zX;hqPHL#7BS5%TZF^WrGJ~j9L53X~dzm^5slAe3+T}IR zZE{~=Xcni=R8&OE!|NFFi&$gI1YCtuFtKa_r;;jd=y;^A!Fux3;~do{!a};qWCB-I zqDTZ;i5Dh$v7Dt~)M=c0_XCvxbSey@4Hk;zA%+sAa@e&S+!3dh_v@sauyUAhsHRU& z2Lg3vp6PIZP&GJ>G)zL>=_i4;-}1!#iKZ!$WA$^-mrDL1mh)7KzKl)filtHxU(5I& z7WFPjXQ&mGY3Jx{r_2^3zjy`*Det2~0)ysN$*tQS^ zc5SgsnaGcx0!8(q3z?xvrG2#`=55EZoq6uoBFTchJrpU|^6XQl6kO|Uw$Ub1q7l?`| zMJMZ$+CPvV!yXP`qzk+*Wy>EkjCotu+m)fJ+cc=v^4spakbbSEAd_f-+=NtlyEgQO zJiRZE Date: Mon, 12 Mar 2018 20:44:55 +0100 Subject: [PATCH 6/7] Fixed typo - missing | --- block/TableTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/TableTrait.php b/block/TableTrait.php index b793b0d..3d4d2c0 100644 --- a/block/TableTrait.php +++ b/block/TableTrait.php @@ -64,7 +64,7 @@ protected function consumeTable($lines, $current) continue; } - if ($line === '' | substr($lines[$i], 0, 4) === ' ') { + if ($line === '' || substr($lines[$i], 0, 4) === ' ') { break; } if ($line[0] === '|') { From 08ce4238b3455cdbe3970795fade33847b455539 Mon Sep 17 00:00:00 2001 From: GenaBitu Date: Tue, 13 Mar 2018 08:17:46 +0100 Subject: [PATCH 7/7] Altered test, also in the way GFM is rendered --- tests/extra-data/tables.html | 2 +- tests/github-data/tables.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/extra-data/tables.html b/tests/extra-data/tables.html index 1011506..1968f49 100644 --- a/tests/extra-data/tables.html +++ b/tests/extra-data/tables.html @@ -84,6 +84,6 @@

Tables

3 4 +3 4 -

3 | 4

diff --git a/tests/github-data/tables.html b/tests/github-data/tables.html index 09805bb..e3f2135 100644 --- a/tests/github-data/tables.html +++ b/tests/github-data/tables.html @@ -84,9 +84,9 @@

Tables

3 4 +3 4 -

3 | 4

Table With Empty Cells