Skip to content

Commit

Permalink
Vendor Updates (#207)
Browse files Browse the repository at this point in the history
* Vendor Updates

	•	psr/http-factory: von Version 1.0.2 auf 1.1.0.
	•	symfony/deprecation-contracts: von Version v3.4.0 auf v3.5.0.
	•	symfony/http-client: von Version v6.4.10 auf v7.1.3.
	•	symfony/http-client-contracts: von Version v3.4.2 auf v3.5.0.
	•	symfony/service-contracts: von Version v3.4.2 auf v3.5.0.

* small code fixes
  • Loading branch information
skerbis authored Jul 30, 2024
1 parent eeb87fc commit 4480898
Show file tree
Hide file tree
Showing 54 changed files with 535 additions and 410 deletions.
6 changes: 4 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"madcoda/php-youtube-api": "*",
"vimeo/vimeo-api": "*",
"debril/feed-io": "*",
"symfony/http-client": "^6.3"
"symfony/http-client": "*"
},
"replace": {
"psr/log": "*",
Expand All @@ -19,7 +19,9 @@
"symfony/polyfill-php73": "*",
"symfony/polyfill-php74": "*",
"symfony/polyfill-php80": "*",
"symfony/polyfill-php81": "*"
"symfony/polyfill-php81": "*",
"symfony/polyfill-php82": "*",
"symfony/polyfill-php83": "*"
},
"config": {
"allow-plugins": {
Expand Down
90 changes: 46 additions & 44 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package: feeds
version: '4.1.0'
version: '4.1.1'
author: Friends Of REDAXO
supportpage: https://github.com/FriendsOfREDAXO/feeds

Expand Down
7 changes: 3 additions & 4 deletions pages/items.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
$list->setColumnLabel('date', $this->i18n('item_date'));
$list->setColumnSortable('date', $direction = 'DESC');


$list->setColumnLabel('namespace', $this->i18n('stream_namespace') . '/' . $this->i18n('stream_type'));
$list->setColumnFormat('namespace', 'custom', function ($params) {
/** @var rex_list $list */
Expand All @@ -108,15 +107,15 @@
/** @var rex_list $list */
$list = $params['list'];
$title = $list->getValue('title');
if ($title === null) {
$title = ''; // Set to empty string if null
}
$title = rex_formatter::truncate($title, ['length' => 140]);
$title .= ($list->getValue('url') != '') ? '<br /><small><a href="' . $list->getValue('url') . '" target="_blank">' . $list->getValue('url') . '</a></small>' : '';
$title = '<div class="rex-word-break"><span class="title' . (($list->getValue('status')) ? '' : ' text-muted') . '">' . $title . '</span></div>';
return $title;
});




$list->setColumnLabel('media', $this->i18n('item_media'));
$list->setColumnFormat('media', 'custom', function ($params) {
/** @var rex_list $list */
Expand Down
Loading

0 comments on commit 4480898

Please sign in to comment.