Skip to content

Commit bc8ad39

Browse files
VitexusVitexus
committed
Code reformat
1 parent 70ea81e commit bc8ad39

11 files changed

Lines changed: 53 additions & 45 deletions

File tree

‎Examples/liveage.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,29 @@
2323
$now = new DateTime();
2424
$oPage->addItem(new \Ease\Html\H1Tag('LiveAge Widget'));
2525
$oPage->addItem($now->format('Y-m-d H:i:s').'<br>');
26-
$oPage->addItem(new \Ease\Html\Widgets\LiveAge($now,['title'=>'now']));
26+
$oPage->addItem(new \Ease\Html\Widgets\LiveAge($now, ['title' => 'now']));
2727

2828
$oneminute = new DateTime();
2929
$oPage->addItem(new \Ease\Html\H2Tag('LiveAge Widget +1 minute'));
3030
$oneminute->modify('+1 minute');
3131
$oPage->addItem($oneminute->format('Y-m-d H:i:s').'<br>');
32-
$oPage->addItem(new \Ease\Html\Widgets\LiveAge($oneminute,['title'=>'+1 minute']));
32+
$oPage->addItem(new \Ease\Html\Widgets\LiveAge($oneminute, ['title' => '+1 minute']));
3333

3434
$fiveminutes = new DateTime();
3535
$oPage->addItem(new \Ease\Html\H2Tag('LiveAge Widget +5 minutes'));
3636
$fiveminutes->modify('+5 minutes');
37-
$oPage->addItem( $fiveminutes->format('Y-m-d H:i:s').'<br>');
38-
$oPage->addItem(new \Ease\Html\Widgets\LiveAge($fiveminutes,['title'=>'+5 minutes']));
37+
$oPage->addItem($fiveminutes->format('Y-m-d H:i:s').'<br>');
38+
$oPage->addItem(new \Ease\Html\Widgets\LiveAge($fiveminutes, ['title' => '+5 minutes']));
3939

4040
$fifteenminutes = new DateTime();
4141
$oPage->addItem(new \Ease\Html\H2Tag('LiveAge Widget -15 minutes'));
4242
$fifteenminutes->modify('-15 minutes');
43-
$oPage->addItem( $fifteenminutes->format('Y-m-d H:i:s').'<br>');
44-
$oPage->addItem(new \Ease\Html\Widgets\LiveAge($fifteenminutes,['title'=>'-15 minutes']));
43+
$oPage->addItem($fifteenminutes->format('Y-m-d H:i:s').'<br>');
44+
$oPage->addItem(new \Ease\Html\Widgets\LiveAge($fifteenminutes, ['title' => '-15 minutes']));
4545

4646
$yesterday = new DateTime('yesterday 13:00');
4747
$oPage->addItem(new \Ease\Html\H2Tag('LiveAge Widget Yesterday 13:00'));
4848
$oPage->addItem($yesterday->format('Y-m-d H:i:s').'<br>');
49-
$oPage->addItem(new \Ease\Html\Widgets\LiveAge($yesterday,['title'=>'Yesterday 13:00']));
49+
$oPage->addItem(new \Ease\Html\Widgets\LiveAge($yesterday, ['title' => 'Yesterday 13:00']));
5050

5151
echo $oPage;

‎debian/changelog‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
php-vitexsoftware-ease-html-widgets (1.1.0) UNRELEASED; urgency=medium
1+
php-vitexsoftware-ease-html-widgets (1.1.0) unstable; urgency=medium
22

3-
* Semafor Light added
3+
* Jenkins now stores artifacts
4+
* Semantic versioning used
5+
* phpstan used
6+
* Added Semafor Light widget
7+
* Updated LiveAge widget to show live countdown with "+" and "-" signs
8+
* Various code improvements and refactoring
49

510
-- vitex <info@vitexsoftware.cz> Sat, 16 Nov 2024 12:59:37 +0100
611

‎src/Ease/Html/Widgets/BrowsingHistory.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
/**
1919
* Show history of visited pages in app.
2020
*
21-
* @param mixed $content
2221
* @param array $properties
22+
* @param mixed $content
2323
*/
2424
class BrowsingHistory extends \Ease\Html\DivTag
2525
{
2626
/**
2727
* Show history of visited pages in app.
2828
*
29-
* @param array<string> $histrory Array of visited pages
30-
* @param array<string,string> $properties Additional properties
29+
* @param array<string> $histrory Array of visited pages
30+
* @param array<string, string> $properties Additional properties
3131
*/
3232
public function __construct(array $histrory = [], array $properties = [])
3333
{

‎src/Ease/Html/Widgets/LangLinks.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ class LangLinks extends \Ease\Html\UlTag
2424
{
2525
/**
2626
* Language Selector.
27-
* @param array<string,string> $properties
27+
*
28+
* @param array<string, string> $properties
2829
*/
2930
public function __construct(array $properties = [])
3031
{

‎src/Ease/Html/Widgets/LangSelect.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class LangSelect extends \Ease\Html\SelectTag
2525
/**
2626
* Language Selector.
2727
*
28-
* @param string $name Input Name
29-
* @param array<string,string> $properties Additional properties
28+
* @param string $name Input Name
29+
* @param array<string, string> $properties Additional properties
3030
*/
3131
public function __construct(string $name = 'lang', array $properties = [])
3232
{

‎src/Ease/Html/Widgets/LiveAge.php‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
namespace Ease\Html\Widgets;
1717

18-
use DateTime;
1918
use Ease\Html\TimeTag;
2019

2120
/**
@@ -28,22 +27,23 @@ class LiveAge extends TimeTag
2827
/**
2928
* Show live time to timestamp.
3029
*
31-
* @param DateTime $dater When to count from
32-
* @param array<string,string> $properties TimeTag properties
30+
* @param \DateTime $dater When to count from
31+
* @param array<string, string> $properties TimeTag properties
3332
*/
3433
public function __construct($dater, array $properties = [])
3534
{
36-
$days = $dater->diff(new DateTime())->days;
37-
$age = ($dater->getTimestamp() - (new DateTime())->getTimestamp());
35+
$days = $dater->diff(new \DateTime())->days;
36+
$age = ($dater->getTimestamp() - (new \DateTime())->getTimestamp());
3837

3938
$properties['datetime'] = $dater->format('Y-m-d\TH:i:s');
4039
parent::__construct(
4140
$days.' '._('days').', '.gmdate('G:i:s', $age),
42-
$properties
41+
$properties,
4342
);
4443
$this->setTagID();
4544

46-
$this->addJavaScript('
45+
$this->addJavaScript(<<<'EOD'
46+
4747
function component(x, v) {
4848
return Math.floor(x / v);
4949
}
@@ -63,11 +63,16 @@ function updateCountdown(tagID, targetTimestamp) {
6363
document.getElementById(tagID).innerHTML = sign + " " + days + "d " + hours + "h " + minutes + "m " + seconds + "s";
6464
}
6565
66-
var targetTimestamp' . $this->getTagID().' = '.$dater->getTimestamp(). ';
66+
var targetTimestamp
67+
EOD.$this->getTagID().' = '.$dater->getTimestamp().<<<'EOD'
68+
;
6769
6870
setInterval(function() {
69-
updateCountdown("' . $this->getTagID(). '", targetTimestamp' . $this->getTagID().');
71+
updateCountdown("
72+
EOD.$this->getTagID().'", targetTimestamp'.$this->getTagID().<<<'EOD'
73+
);
7074
}, 1000);
71-
');
75+
76+
EOD);
7277
}
7378
}

‎src/Ease/Html/Widgets/OldTerminal.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ class OldTerminal extends \Ease\Html\DivTag
4545
/**
4646
* Old Style Terminal Div.
4747
*
48-
* @param mixed $content
49-
* @param array<string,string> $properties
48+
* @param mixed $content
49+
* @param array<string, string> $properties
5050
*/
5151
public function __construct($content = null, $properties = [])
5252
{

‎src/Ease/Html/Widgets/OpenClipart.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ class OpenClipart extends \Ease\Html\ATag
2525
/**
2626
* OpenClipart Image.
2727
*
28-
* @param string $directory Directory with images
29-
* @param string $alt Image Alt
30-
* @param array<string,string> $properties Additional properties
28+
* @param string $directory Directory with images
29+
* @param string $alt Image Alt
30+
* @param array<string, string> $properties Additional properties
3131
*/
3232
public function __construct($directory, $alt, $properties = [])
3333
{

‎src/Ease/Html/Widgets/SandClock.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ class SandClock extends \Ease\Html\ImgTag
9898
</svg>
9999
EOD;
100100

101-
/**
102-
* SandClock.
103-
*
104-
* @param array<string,string> $properties
105-
*/
106-
public function __construct(array $properties = [])
101+
/**
102+
* SandClock.
103+
*
104+
* @param array<string, string> $properties
105+
*/
106+
public function __construct(array $properties = [])
107107
{
108108
parent::__construct(self::base64src(self::$sandClockSVG, 'image/svg+xml'), _('Please wait'), $properties);
109109
\Ease\WebPage::singleton()->addCss(<<<'EOD'

‎src/Ease/Html/Widgets/SemaforLight.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
declare(strict_types=1);
44

55
/**
6-
* This file is part of the Ease TWBootstrap4 Widgets package
6+
* This file is part of the EaseHtmlWidgets package
77
*
8-
* https://github.com/VitexSoftware/php-ease-twbootstrap4-widgets
8+
* https://github.com/VitexSoftware/php-vitexsoftware-ease-html-widgets
99
*
1010
* (c) Vítězslav Dvořák <http://vitexsoftware.com>
1111
*

0 commit comments

Comments
 (0)