version for php 7.0

contributte · Jun 1, 2017 · dbeda81 · dbeda81
1 parent c084730
commit dbeda81
Show file tree

Hide file tree

Showing 23 changed files with 174 additions and 170 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,22 @@
+anguage: php
+
+os:
+  - linux
+
+php:
+  - 7.0
+  - 7.1
+
+matrix:
+  include:
+    - php: 7.0
+      env: PHPSTAN=1
+    - php: 7.1
+      env: PHPSTAN=1
+
+install:
+    - composer self-update
+    - composer install
+
+script:
+  - if ["$PHPSTAN" = "1"]; then vendor/bin/phpstan analyse src --level=7 --ansi --no-progress; fi
diff --git a/README.md b/README.md
@@ -1,11 +1,21 @@
+[![Build Status](https://travis-ci.org/WebChemistry/invoice.svg?branch=master)](https://travis-ci.org/WebChemistry/invoice)
+
 # PHP Invoice
 
 ## Installation
 
+php 7.0
+
 ```
 composer require webchemistry/invoice
 ```
 
+php 5.5
+
+```
+composer require webchemistry/invoice:^1.0
+```
+
 ## Usage
 
 ### Company

diff --git a/composer.json b/composer.json
@@ -7,12 +7,13 @@
 		"invoice"
 	],
 	"require": {
-		"php": ">=5.5",
+		"php": ">=7.0",
 		"intervention/image": "^2.3",
 		"nette/utils": "^2.3"
 	},
 	"require-dev": {
-		"nette/di": "^2.3"
+		"nette/di": "^2.3",
+		"phpstan/phpstan": "^0.7.0"
 	},
 	"autoload": {
 		"psr-4": {

diff --git a/src/Components/IPaginator.php b/src/Components/IPaginator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace WebChemistry\Invoice\Components;
 
 use WebChemistry\Invoice\Data\Item;
@@ -9,26 +11,26 @@ interface IPaginator {
 	/**
 	 * @return int
 	 */
-	public function getTotalPages();
+	public function getTotalPages(): int;
 
 	/**
 	 * @return Item[]
 	 */
-	public function getItems();
+	public function getItems(): array;
 
 	/**
 	 * @return bool
 	 */
-	public function isLastPage();
+	public function isLastPage(): bool;
 
 	/**
 	 * @return int
 	 */
-	public function getCurrentPage();
+	public function getCurrentPage(): int;
 
 	/**
 	 * @return bool
 	 */
-	public function hasNextPage();
+	public function hasNextPage(): bool;
 
 }
diff --git a/src/Components/IPaginatorFactory.php b/src/Components/IPaginatorFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace WebChemistry\Invoice\Components;
 
 use WebChemistry\Invoice\Data\Item;
@@ -10,6 +12,6 @@ interface IPaginatorFactory {
 	 * @param Item[] $items
 	 * @return IPaginator
 	 */
-	public function createPaginator(array $items);
+	public function createPaginator(array $items): IPaginator;
 
 }
diff --git a/src/Components/Paginator.php b/src/Components/Paginator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace WebChemistry\Invoice\Components;
 
 use WebChemistry\Invoice\Data\Item;
@@ -28,14 +30,14 @@ public function __construct(array $items) {
 	/**
 	 * @return int
 	 */
-	public function getTotalPages() {
+	public function getTotalPages(): int {
 		return $this->totalPages;
 	}
 
 	/**
 	 * @return Item[]
 	 */
-	public function getItems() {
+	public function getItems(): array {
 		$page = $this->currentPage - 1;
 
 		return array_slice($this->items, $page * self::ITEMS_PER_PAGE, $page * self::ITEMS_PER_PAGE + self::ITEMS_PER_PAGE);
@@ -44,21 +46,21 @@ public function getItems() {
 	/**
 	 * @return bool
 	 */
-	public function isLastPage() {
+	public function isLastPage(): bool {
 		return $this->currentPage >= $this->getTotalPages();
 	}
 
 	/**
 	 * @return int
 	 */
-	public function getCurrentPage() {
+	public function getCurrentPage(): int {
 		return $this->currentPage;
 	}
 
 	/**
 	 * @return bool
 	 */
-	public function hasNextPage() {
+	public function hasNextPage(): bool {
 		if ($this->isLastPage()) {
 			return FALSE;
 		}

diff --git a/src/Components/PaginatorFactory.php b/src/Components/PaginatorFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace WebChemistry\Invoice\Components;
 
 use WebChemistry\Invoice\Data\Item;
@@ -8,9 +10,9 @@ class PaginatorFactory implements IPaginatorFactory {
 
 	/**
 	 * @param Item[] $items
-	 * @return Paginator
+	 * @return IPaginator
 	 */
-	public function createPaginator(array $items) {
+	public function createPaginator(array $items): IPaginator {
 		return new Paginator($items);
 	}
 

diff --git a/src/DI/InvoiceExtension.php b/src/DI/InvoiceExtension.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace WebChemistry\Invoice\DI;
 
 use Nette\DI\CompilerExtension;

diff --git a/src/Data/Account.php b/src/Data/Account.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace WebChemistry\Invoice\Data;
+declare(strict_types=1);
 
-use WebChemistry\Invoice\InvoiceException;
+namespace WebChemistry\Invoice\Data;
 
 class Account {
 
@@ -20,51 +20,32 @@ class Account {
 	 * @param string|null $iBan
 	 * @param string|null $swift
 	 */
-	public function __construct($accountNumber, $iBan = NULL, $swift = NULL) {
+	public function __construct(string $accountNumber, ?string $iBan = NULL, ?string $swift = NULL) {
 		$this->accountNumber = $accountNumber;
 		$this->iBan = $iBan;
 		$this->swift = $swift;
-
-		$this->validate();
-	}
-
-	/**
-	 * Validates properties
-	 *
-	 * @throws InvoiceException
-	 */
-	private function validate() {
-		if (!$this->accountNumber || !is_string($this->accountNumber)) {
-			throw InvoiceException::wrongType('non-empty string', $this->accountNumber);
-		}
-		if ($this->iBan !== NULL && !$this->iBan || !is_string($this->iBan)) {
-			throw InvoiceException::wrongType('non-empty string or null', $this->iBan);
-		}
-		if ($this->swift !== NULL && !$this->swift || !is_string($this->swift)) {
-			throw InvoiceException::wrongType('non-empty string or null', $this->iBan);
-		}
 	}
 
 	/////////////////////////////////////////////////////////////////
 
 	/**
 	 * @return string
 	 */
-	public function getAccountNumber() {
+	public function getAccountNumber(): string {
 		return $this->accountNumber;
 	}
 
 	/**
 	 * @return null|string
 	 */
-	public function getIBan() {
+	public function getIBan(): ?string {
 		return $this->iBan;
 	}
 
 	/**
 	 * @return null|string
 	 */
-	public function getSwift() {
+	public function getSwift(): ?string {
 		return $this->swift;
 	}
 

diff --git a/src/Data/Company.php b/src/Data/Company.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace WebChemistry\Invoice\Data;
 
 class Company extends Subject {
@@ -17,16 +19,16 @@ class Company extends Subject {
 	 * @param string|null $vaTin
 	 * @param bool $hasTax
 	 */
-	public function __construct($name, $town, $address, $zip, $country, $tin = NULL, $vaTin = NULL,
-								$hasTax = FALSE) {
+	public function __construct(string $name, string $town, string $address, string $zip, string $country, ?string $tin = NULL, ?string $vaTin = NULL,
+								bool $hasTax = FALSE) {
 		parent::__construct($name, $town, $address, $zip, $country, $tin, $vaTin);
-		$this->hasTax = (bool) $hasTax;
+		$this->hasTax = $hasTax;
 	}
 
 	/**
 	 * @return bool
 	 */
-	public function hasTax() {
+	public function hasTax(): bool {
 		return $this->hasTax;
 	}
 

diff --git a/src/Data/Customer.php b/src/Data/Customer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace WebChemistry\Invoice\Data;
 
 class Customer extends Subject {

diff --git a/src/Data/Item.php b/src/Data/Item.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace WebChemistry\Invoice\Data;
 
 use WebChemistry\Invoice\InvoiceException;
@@ -9,19 +11,19 @@ class Item {
 	/** @var string */
 	protected $name;
 
-	/** @var int */
+	/** @var int|float */
 	protected $count;
 
-	/** @var int */
+	/** @var int|float */
 	protected $price;
 
 	/**
 	 * @param string $name
-	 * @param int $count
-	 * @param int $price
+	 * @param int|float $count
+	 * @param int|float $price
 	 * @throws InvoiceException
 	 */
-	public function __construct($name, $count, $price) {
+	public function __construct(string $name, $count, $price) {
 		$this->name = $name;
 		$this->count = $count;
 		$this->price = $price;
@@ -35,9 +37,6 @@ public function __construct($name, $count, $price) {
 	 * @throws InvoiceException
 	 */
 	private function validate() {
-		if (!$this->name || !is_string($this->name)) {
-			throw InvoiceException::wrongType('non-empty string', $this->name);
-		}
 		if (!is_numeric($this->count)) {
 			throw InvoiceException::wrongType('numeric', $this->count);
 		}
@@ -51,19 +50,19 @@ private function validate() {
 	/**
 	 * @return string
 	 */
-	public function getName() {
+	public function getName(): string {
 		return $this->name;
 	}
 
 	/**
-	 * @return int
+	 * @return int|float
 	 */
 	public function getCount() {
 		return $this->count;
 	}
 
 	/**
-	 * @return int
+	 * @return int|float
 	 */
 	public function getPrice() {
 		return $this->price;