Skip to content

Commit bf301b3

Browse files
dgdg
committed
LinkModule: deprecated label and modifiers in link definitions
1 parent 5f74c0d commit bf301b3

10 files changed

Lines changed: 41 additions & 54 deletions

File tree

‎src/Texy/Link.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ final class Link
3030
/** how was link created? */
3131
public int $type = self::COMMON;
3232

33-
/** optional label, used by references */
34-
public ?string $label = null;
35-
3633
/** reference name (if is stored as reference) */
3734
public ?string $name = null;
3835

‎src/Texy/Modules/LinkModule.php‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,18 @@ public function beforeParse(string &$text): void
5959

6060

6161
/**
62-
* Parses [la trine]: http://www.latrine.cz/ text odkazu .(title)[class]{style}
62+
* Parses [la trine]: http://www.latrine.cz/
6363
* @param array<?string> $matches
6464
*/
6565
private function parseDefinition(array $matches): string
6666
{
6767
/** @var array{string, string, string, ?string, ?string} $matches */
6868
[, $mRef, $mLink, $mLabel, $mMod] = $matches;
69-
// [1] => [ (reference) ]
70-
// [2] => link
71-
// [3] => ...
72-
// [4] => .(title)[class]{style}
69+
if ($mMod || $mLabel) {
70+
trigger_error('Modifiers and label in link definitions are deprecated.', E_USER_DEPRECATED);
71+
}
7372

7473
$link = new Link($mLink);
75-
$link->label = trim($mLabel ?? '');
76-
$link->modifier->setProperties($mMod);
7774
$this->checkLink($link);
7875
$link->name = Texy\Helpers::toLower($mRef);
7976
$this->references[$link->name] = $link;
@@ -84,13 +81,9 @@ private function parseDefinition(array $matches): string
8481
/**
8582
* Adds a user-defined link definition (persists across process() calls).
8683
*/
87-
public function addDefinition(string $name, string $url, ?string $label = null, ?string $title = null): void
84+
public function addDefinition(string $name, string $url): void
8885
{
8986
$link = new Link($url);
90-
$link->label = $label ?? '';
91-
if ($title !== null) {
92-
$link->modifier->title = $title;
93-
}
9487
$link->name = Texy\Helpers::toLower($name);
9588
$this->references[$link->name] = $link;
9689
}
@@ -143,7 +136,6 @@ public function factoryLink(string $dest, ?string $mMod, ?string $label): Link
143136
$image = $texy->imageModule->getReference($dest);
144137
if ($image) {
145138
$link = new Link($image->linkedURL ?? $image->URL);
146-
$link->modifier = $image->modifier;
147139
}
148140
}
149141

‎tests/Texy/block.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ test('block type variants', function () {
2828
$texy->imageModule->root = '../images/';
2929
$texy->htmlOutputModule->lineWrap = 180;
3030

31-
$texy->linkModule->addDefinition('texy', 'https://texy.nette.org/', 'Texy!', 'The best text -> HTML converter and formatter');
31+
$texy->linkModule->addDefinition('texy', 'https://texy.nette.org/');
3232

3333
Assert::matchFile(
3434
__DIR__ . '/expected/block-types.html',

‎tests/Texy/expected/link-combined-classes.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ <h1>Odkazy</h1>
1919

2020
<li>Klasický odkaz <a href="mailto:dave&#64;example.com">php Fashion</a></li>
2121

22-
<li>Referenční odkaz <a href="http://phpfashion.com/" title="title">php Fashion</a></li>
22+
<li>Referenční odkaz <a href="http://phpfashion.com/">php Fashion</a></li>
2323

24-
<li>Referenční odkaz <a href="/trine/" title="title">php Fashion</a></li>
24+
<li>Referenční odkaz <a href="/trine/">php Fashion</a></li>
2525

2626
<li>Referenční odkaz <a href="xxx/./trine/">php Fashion</a></li>
2727

28-
<li>Referenční odkaz <a href="mailto:dave&#64;example.com" title="title">php Fashion</a></li>
28+
<li>Referenční odkaz <a href="mailto:dave&#64;example.com">php Fashion</a></li>
2929

3030
<li>Referenční odkaz <a href="http://phpfashion.com/" title="title2">php Fashion</a>?</li>
3131

3232
<li>Referenční odkaz <a href="/trine/" title="title2">php Fashion</a>?</li>
3333

34-
<li>Referenční odkaz <a href="http://phpfashion.com/#12" title="title">php Fashion</a>?</li>
34+
<li>Referenční odkaz <a href="http://phpfashion.com/#12">php Fashion</a>?</li>
3535

36-
<li>Referenční odkaz <a href="/trine/?a=45" title="title">php Fashion</a>?</li>
36+
<li>Referenční odkaz <a href="/trine/?a=45">php Fashion</a>?</li>
3737

3838
<li>wiki link <a href="http://texy.info">Texy</a></li>
3939

@@ -53,9 +53,9 @@ <h1>Obrázkové odkazy:</h1>
5353

5454
<li>Klasický odkaz <a href="../images/texy-big.jpg">obrazek</a></li>
5555

56-
<li>Referenční odkaz <a href="xxx/[*texy-big.jpg*]" title="title">obrazek</a></li>
56+
<li>Referenční odkaz <a href="xxx/[*texy-big.jpg*]">obrazek</a></li>
5757

58-
<li>Referenční odkaz <a href="../images/texy.jpg" title="altX">obrazek</a></li>
58+
<li>Referenční odkaz <a href="../images/texy.jpg">obrazek</a></li>
5959

6060
<li>Referenční odkaz <a href="../images/texy.jpg">obrazek</a></li>
6161
</ul>
@@ -73,21 +73,21 @@ <h1>Odkazující obrázky:</h1>
7373

7474
<li>Referenční odkaz <a href="../images/texy.jpg">php Fashion</a></li>
7575

76-
<li>Referenční odkaz <a href="mailto:dave&#64;example.com" title="title"><img src="../images/texy.jpg" alt="" width="10" height="13"></a></li>
76+
<li>Referenční odkaz <a href="mailto:dave&#64;example.com"><img src="../images/texy.jpg" alt="" width="10" height="13"></a></li>
7777

7878
<li>Referenční odkaz <a href="../images/texy.jpg" title="title2">php Fashion</a>?</li>
7979

8080
<li>Referenční odkaz <a href="../images/texy.jpg" title="title2">php Fashion</a>?</li>
8181

82-
<li>Referenční odkaz <a href="/trine/" title="title"><img src="../images/texy.jpg" alt="altX"></a></li>
82+
<li>Referenční odkaz <a href="/trine/"><img src="../images/texy.jpg" alt="altX"></a></li>
8383

8484
<li>Referenční odkaz <a href="/trine/"><img src="../images/texy.jpg" alt="" width="10" height="13"></a>x</li>
8585

8686
<li>Referenční odkaz <a href="../images/texy.jpg"><img src="../images/texy.jpg" alt="" class="left"></a></li>
8787

8888
<li>Referenční odkaz <a href="../images/texy.jpg"><img src="../images/texy.jpg" alt="" style="float:right" width="10" height="13"></a></li>
8989

90-
<li>Referenční odkaz <a href="../images/texy.jpg" title="altX"><img src="../images/texy-big.jpg" alt=""></a></li>
90+
<li>Referenční odkaz <a href="../images/texy.jpg"><img src="../images/texy-big.jpg" alt=""></a></li>
9191

9292
<li>Čistě referenční obrázek <img src="../images/texy.jpg" alt="altX"></li>
9393

‎tests/Texy/expected/link-combined-safe.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ <h1>Obrázkové odkazy:</h1>
5555

5656
<li>Referenční odkaz <a href="xxx/neobrazek1">obrazek</a></li>
5757

58-
<li>Referenční odkaz <a href="../images/texy.jpg" title="altX">obrazek</a></li>
58+
<li>Referenční odkaz <a href="../images/texy.jpg">obrazek</a></li>
5959

6060
<li>Referenční odkaz <a href="../images/texy.jpg">obrazek</a></li>
6161
</ul>
@@ -189,8 +189,7 @@ <h1>Pure</h1>
189189
<li><a href="http://www.text.cz?(x)#$%10" rel="nofollow">www.text.cz?(x)</a></li>
190190
</ul>
191191

192-
<p title="title">[php Fashion1]: <a href="http://phpfashion.com/" rel="nofollow">http://phpfashion.com/</a> text <em>o</em>dkazu [php Fashion2]: /trine/ .(title) [php Fashion3]:
193-
./trine/ [email]: <a href="mailto:dave&#64;example.com">dave&#64;<!-- -->example.com</a> .(title)</p>
192+
<p>[php Fashion1]: <a href="http://phpfashion.com/" rel="nofollow">http://phpfashion.com/</a> [php Fashion2]: /trine/ [php Fashion3]: ./trine/ [email]: <a
193+
href="mailto:dave&#64;example.com">dave&#64;<!-- -->example.com</a></p>
194194

195-
<p title="title">[neobrazek1]: [<em>texy-big.jpg</em>] text [neobrazek2]: [* texy-big.jpg *] text [neobrazek3]: [<em>texy-big.jpg</em>] [neobrazek4]: [<em>obrazek3</em>]
196-
[<em>obrazek1</em>] .(test)</p>
195+
<p>[neobrazek1]: [<em>texy-big.jpg</em>] [neobrazek2]: [<em>texy-big.jpg</em>] [neobrazek3]: [<em>texy-big.jpg</em>] [neobrazek4]: [<em>obrazek3</em>]</p>

‎tests/Texy/expected/link-combined.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ <h1>Odkazy</h1>
1919

2020
<li>Klasický odkaz <a href="mailto:dave&#64;example.com">php Fashion</a></li>
2121

22-
<li>Referenční odkaz <a href="http://phpfashion.com/" title="title" class="aa">php Fashion</a></li>
22+
<li>Referenční odkaz <a href="http://phpfashion.com/">php Fashion</a></li>
2323

24-
<li>Referenční odkaz <a href="/trine/" title="title">php Fashion</a></li>
24+
<li>Referenční odkaz <a href="/trine/">php Fashion</a></li>
2525

2626
<li>Referenční odkaz <a href="xxx/./trine/">php Fashion</a></li>
2727

28-
<li>Referenční odkaz <a href="mailto:dave&#64;example.com" title="title">php Fashion</a></li>
28+
<li>Referenční odkaz <a href="mailto:dave&#64;example.com">php Fashion</a></li>
2929

30-
<li>Referenční odkaz <a href="http://phpfashion.com/" title="title2" class="aa bb">php Fashion</a>?</li>
30+
<li>Referenční odkaz <a href="http://phpfashion.com/" title="title2" class="bb">php Fashion</a>?</li>
3131

3232
<li>Referenční odkaz <a href="/trine/" title="title2">php Fashion</a>?</li>
3333

34-
<li>Referenční odkaz <a href="http://phpfashion.com/#12" title="title" class="aa">php Fashion</a>?</li>
34+
<li>Referenční odkaz <a href="http://phpfashion.com/#12">php Fashion</a>?</li>
3535

36-
<li>Referenční odkaz <a href="/trine/?a=45" title="title">php Fashion</a>?</li>
36+
<li>Referenční odkaz <a href="/trine/?a=45">php Fashion</a>?</li>
3737

3838
<li>wiki link <a href="http://texy.info">Texy</a></li>
3939

@@ -53,9 +53,9 @@ <h1>Obrázkové odkazy:</h1>
5353

5454
<li>Klasický odkaz <a href="../images/texy-big.jpg">obrazek</a></li>
5555

56-
<li>Referenční odkaz <a href="xxx/[*texy-big.jpg*]" title="title">obrazek</a></li>
56+
<li>Referenční odkaz <a href="xxx/[*texy-big.jpg*]">obrazek</a></li>
5757

58-
<li>Referenční odkaz <a href="../images/texy.jpg" title="altX">obrazek</a></li>
58+
<li>Referenční odkaz <a href="../images/texy.jpg">obrazek</a></li>
5959

6060
<li>Referenční odkaz <a href="../images/texy.jpg">obrazek</a></li>
6161
</ul>
@@ -73,21 +73,21 @@ <h1>Odkazující obrázky:</h1>
7373

7474
<li>Referenční odkaz <a href="../images/texy.jpg">php Fashion</a></li>
7575

76-
<li>Referenční odkaz <a href="mailto:dave&#64;example.com" title="title"><img src="../images/texy.jpg" alt="" width="10" height="13"></a></li>
76+
<li>Referenční odkaz <a href="mailto:dave&#64;example.com"><img src="../images/texy.jpg" alt="" width="10" height="13"></a></li>
7777

7878
<li>Referenční odkaz <a href="../images/texy.jpg" title="title2" class="bb">php Fashion</a>?</li>
7979

8080
<li>Referenční odkaz <a href="../images/texy.jpg" title="title2">php Fashion</a>?</li>
8181

82-
<li>Referenční odkaz <a href="/trine/" title="title"><img src="../images/texy.jpg" alt="altX"></a></li>
82+
<li>Referenční odkaz <a href="/trine/"><img src="../images/texy.jpg" alt="altX"></a></li>
8383

8484
<li>Referenční odkaz <a href="/trine/"><img src="../images/texy.jpg" alt="" width="10" height="13"></a>x</li>
8585

8686
<li>Referenční odkaz <a href="../images/texy.jpg"><img src="../images/texy.jpg" alt="" class="left"></a></li>
8787

8888
<li>Referenční odkaz <a href="../images/texy.jpg"><img src="../images/texy.jpg" alt="" style="float:right" width="10" height="13"></a></li>
8989

90-
<li>Referenční odkaz <a href="../images/texy.jpg" title="altX"><img src="../images/texy-big.jpg" alt=""></a></li>
90+
<li>Referenční odkaz <a href="../images/texy.jpg"><img src="../images/texy-big.jpg" alt=""></a></li>
9191

9292
<li>Čistě referenční obrázek <img src="../images/texy.jpg" alt="altX"></li>
9393

‎tests/Texy/expected/showcase.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ <h2>Links</h2>
100100
<h3>using references</h3>
101101

102102
<ul>
103-
<li>What about <a href="http://texy.nette.org/"
104-
title="this is homepage">this</a> site?</li>
103+
<li>What about <a href="http://texy.nette.org/">this</a> site?</li>
105104
</ul>
106105

107106
<h2>Images</h2>

‎tests/Texy/link-reference.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ test('case insensitive reference matching', function () {
6767

6868
test('user-defined link definition works', function () {
6969
$texy = new Texy\Texy;
70-
$texy->linkModule->addDefinition('texy', 'https://texy.nette.org/', 'Texy!', 'The best converter');
70+
$texy->linkModule->addDefinition('texy', 'https://texy.nette.org/');
7171
Assert::same(
72-
"<p><a href=\"https://texy.nette.org/\" title=\"The best converter\">Visit</a></p>\n",
72+
"<p><a href=\"https://texy.nette.org/\">Visit</a></p>\n",
7373
$texy->process('"Visit":[texy]'),
7474
);
7575
});

‎tests/Texy/sources/link-combined.texy‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,15 @@ Pure
119119
- www.text.cz?(x)#$%10
120120

121121

122-
[php Fashion1]: http://phpfashion.com/ text *o*dkazu .(title)[aa]
123-
[php Fashion2]: /trine/ .(title)
122+
[php Fashion1]: http://phpfashion.com/
123+
[php Fashion2]: /trine/
124124
[php Fashion3]: ./trine/
125-
[email]: dave@example.com .(title)
125+
[email]: dave@example.com
126126

127-
[neobrazek1]: [*texy-big.jpg*] text .(title)
128-
[neobrazek2]: [* texy-big.jpg *] text
127+
[neobrazek1]: [*texy-big.jpg*]
128+
[neobrazek2]: [*texy-big.jpg*]
129129
[neobrazek3]: [*texy-big.jpg*]
130-
[neobrazek4]: [*obrazek3*] [*obrazek1*] .(test)
130+
[neobrazek4]: [*obrazek3*]
131131

132132
[*obrazek1*]: texy.jpg .(altX)
133133
[*obrazek2*]: texy.jpg 10x13

‎tests/Texy/sources/showcase.texy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ Links
143143
using references
144144
----------------
145145

146-
[homepage]: http://texy.nette.org/ Texy! .(this is homepage)
146+
[homepage]: http://texy.nette.org/
147147
[email]: me@example.com
148148

149149

0 commit comments

Comments
 (0)