Merge pull request #3 from vinogradsoft/1.1.0-dev

Added getLast method to the Compass\Path class.

README.md

@@ -373,6 +373,7 @@ echo '<br>', $path; # newPath/newTo/file.v
 $path->replace('newPath','path');
 $path->updateSource();
 echo '<br>', $path; # path/newTo/file.v
+echo '<br>', $path->getLast(); # file.v
 ```
 
 ## Тестировать

composer.json

@@ -8,7 +8,7 @@
  "email": "[email protected]"
  }
  ],
- "version": "1.0.0",
+ "version": "1.1.0",
  "minimum-stability": "stable",
  "autoload": {
  "psr-4": {

src/AbstractPath.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Compass;
 

src/DefaultPathStrategy.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Compass;
 

src/DefaultQueryStrategy.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Compass;
 

src/DefaultUrlStrategy.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Compass;
 

src/Exception/InvalidPathException.php

@@ -1,8 +1,9 @@
 <?php
+declare(strict_types=1);
 
 namespace Compass\Exception;
 
-class InvalidPathException  extends \DomainException
+class InvalidPathException extends \DomainException
 {
 
 }

src/Exception/InvalidUrlException.php

@@ -1,8 +1,9 @@
 <?php
+declare(strict_types=1);
 
 namespace Compass\Exception;
 
-class InvalidUrlException  extends \DomainException
+class InvalidUrlException extends \DomainException
 {
 
 }

src/Path.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Compass;
 
@@ -64,6 +65,22 @@ public static function createBlank(string $separator = DIRECTORY_SEPARATOR, ?Pat
  return (clone $prototypePath)->initUrlPath($separator, $strategy);
  }
 
+ /**
+ * @param bool $withSuffix
+ * @return string|null
+ */
+ public function getLast(bool $withSuffix = true): ?string
+ {
+ $lastItem = $this->items[count($this->items) - 1] ?? null;
+ if ($lastItem === null) {
+ return null;
+ }
+ if ($withSuffix && !empty($this->suffix)) {
+ return $lastItem . $this->suffix;
+ }
+ return $lastItem;
+ }
+
  /**
  * @param PathStrategy $strategy
  */

src/PathStrategy.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Compass;
 

src/Query.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Compass;
 

src/QueryStrategy.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Compass;
 

src/Url.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Compass;
 
@@ -299,7 +300,7 @@ public function setHost(string $host): static
  */
  public function getPort(): ?string
  {
- return !empty($this->items[self::PORT]) ? $this->items[self::PORT] : null;
+ return !empty($this->items[self::PORT]) ? (string)$this->items[self::PORT] : null;
  }
 
  /**

src/UrlStrategy.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Compass;
 

tests/DefaultPathStrategyTest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Test;
 

tests/DefaultUrlQueryStrategyTest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Test;
 

tests/DefaultUrlStrategyTest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Test;
 

tests/PathTest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Test;
 
@@ -34,6 +35,28 @@ public function testGetAssertionNegative()
  $path->get(-1);
  }
 
+ /**
+ * @dataProvider getCasesGet
+ */
+ public function testGetLast($source, $withSuffix, $expect)
+ {
+ $path = new Path($source);
+ self::assertEquals($expect, $path->getLast($withSuffix));
+ }
+
+ /**
+ * @return array
+ */
+ public function getCasesGet(): array
+ {
+ return [
+ 'standard' => ['/src/Scanner/Driver/File/index.php', true, 'index.php'],
+ 'dot' => ['/src/Scanner/Driver/File/.php', true, '.php'],
+ 'no dot' => ['/src/Scanner/Driver/File/name', true, 'name'],
+ 'empty' => ['/', true, null],
+ ];
+ }
+
  public function testReplaceAll()
  {
  $path = new Path('/s__NAME____NAME__rc/__NAME__Scanner/Driver__NAME__/Fi__NAME2__le/');

tests/UrlPathTest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Test;
 

tests/UrlQueryTest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Test;
 

tests/UrlTest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Test;
 
@@ -248,7 +249,7 @@ public function testRepeatReset()
 
  $url->reset();
  $url->setSource('http://vinograd.ru');
- $url->setPort(80);
+ $url->setPort('80');
  $url->updateSource();
  self::assertEquals('http://vinograd.ru:80', $url->getSource());
  }