Integration of image-storage v0.5

Author: tg666

.gitattributes

@@ -2,4 +2,5 @@
 .gitignore export-ignore
 .php_cs.dist export-ignore
 .travis.yml export-ignore
+.scrutinizer.yml export-ignore
 tests export-ignore

.gitignore

@@ -1,3 +1,3 @@
-composer.lock
-/vendor
 /.idea
+composer.lock
+vendor

.php_cs.dist

@@ -3,6 +3,7 @@
 $finder = PhpCsFixer\Finder::create()
 	->in(__DIR__ . '/src')
 	->in(__DIR__ . '/tests')
+	->exclude('temp')
 ;
 
 return PhpCsFixer\Config::create()

.scrutinizer.yml

@@ -0,0 +1,23 @@
+checks:
+    php:
+        remove_extra_empty_lines: true
+        remove_php_closing_tag: true
+        remove_trailing_whitespace: true
+        fix_use_statements:
+            remove_unused: true
+            preserve_multiple: false
+            preserve_blanklines: true
+            order_alphabetically: true
+        fix_php_opening_tag: true
+        fix_linefeed: true
+        fix_line_ending: true
+        fix_identation_4spaces: true
+        fix_doc_comments: true
+
+tools:
+    external_code_coverage: true
+    php_analyzer: true
+    php_code_coverage: true
+
+
+before_commands:

.travis.yml

@@ -1,36 +1,47 @@
 language: php
 
 php:
-  - 7.1
+  - 7.3
+  - 7.4
 
 env:
   - TESTER_PHP_BIN="php-cgi"
 
 before_install:
   - composer self-update
 
-install:
-  - composer install --no-interaction --prefer-source
-
-before_script:
-  - travis_retry composer update
-  - travis_retry composer create-project nette/code-checker temp/code-checker ~2.5 --no-interaction
-
 script:
-  # check coding standard for our code
-  - vendor/bin/php-cs-fixer fix --config=.php_cs.dist -v --dry-run
-  - vendor/bin/tester -p $TESTER_PHP_BIN -s ./tests # -c ./tests/php.ini
-  - vendor/bin/tester ./tests --coverage coverage.xml --coverage-src ./src -d zend_extension=xdebug.so
+  - composer run tests
 
 after_failure:
-  # print content of output files *.actual
   - for i in $(find ./tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done
 
-after_script:
-  # get scrutinizer for coverage upload
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover coverage.xml
+jobs:
+  include:
+    -   name: Nette Code Checker
+        install:
+          - travis_retry composer create-project nette/code-checker temp/code-checker ~3.2 --no-progress
+        script:
+          - php temp/code-checker/code-checker --strict-types --short-arrays
+
+    -   name: Php-Cs-Fixer
+        install:
+          - travis_retry composer install --no-progress --prefer-dist
+        script:
+          - vendor/bin/php-cs-fixer fix --config=.php_cs.dist -v --dry-run
+
+    -   stage: Code Coverage
+        install:
+          - travis_retry composer install --no-progress --prefer-dist
+        script:
+          - vendor/bin/tester -p phpdbg tests -s --coverage ./coverage.xml --coverage-src ./src -d zend_extension=xdebug.so
+        after_script:
+          - wget https://scrutinizer-ci.com/ocular.phar
+          - php ocular.phar code-coverage:upload --format=php-clover coverage.xml
+
+  allow_failures:
+    -   name: Nette Code Checker
 
 cache:
-    directories:
-        - $HOME/.composer/cache
+  directories:
+    - $HOME/.composer/cache

LICENSE.md

@@ -8,10 +8,10 @@ Copyright (c) 2019 '68 Publishers
 > to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 > copies of the Software, and to permit persons to whom the Software is
 > furnished to do so, subject to the following conditions:
-> 
+>
 > The above copyright notice and this permission notice shall be included in all
 > copies or substantial portions of the Software.
-> 
+>
 > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 > IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 > FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

README.md

@@ -1,13 +1,13 @@
-# Image Bundle
+# File Bundle
 
-:city_sunset: Simple image management based on our [image-storage](https://github.com/68publishers/image-storage) for Nette Framework.
+:city_sunset: File management bundle based on our [file-storage](https://github.com/68publishers/file-storage) for Nette Framework.
 
 ## Installation
 
-The best way to install 68publishers/image-bundle is using Composer:
+The best way to install 68publishers/file-bundle is using Composer:
 
 ```bash
-composer require 68publishers/image-bundle
+composer require 68publishers/file-bundle
 ```
 
 ## Contributing

composer.json

@@ -1,7 +1,7 @@
 {
-	"name": "68publishers/image-bundle",
-	"description": "Simple image management based on our image-storage for Nette Framework.",
-	"keywords": ["68publishers", "image", "images", "image-bundle", "nette"],
+	"name": "68publishers/file-bundle",
+	"description": "File management bundle based on our file-storage for Nette Framework.",
+	"keywords": ["68publishers", "files", "file-bundle", "images", "nette"],
 	"license": "MIT",
 	"authors": [
 		{
@@ -10,35 +10,61 @@
 		}
 	],
 	"require": {
-		"php": "^7.1",
-		"nette/di": "^2.4",
-		"nette/utils": "^2.4",
-		"nette/application": "^2.4",
-		"nette/forms": "^2.4",
-		"ramsey/uuid": "^3.8",
-		"68publishers/smart-nette-component": "^0.1",
-		"68publishers/doctrine-persistence": "^0.1",
-		"68publishers/image-storage": "^0.4",
-		"symfony/event-dispatcher": "^4.0",
-		"kdyby/doctrine": "^3.0",
-		"kdyby/translation": "^2.4"
+		"php": "^7.3",
+		"ext-fileinfo": "*",
+		"68publishers/doctrine-bridge": "^0.1.1",
+		"68publishers/doctrine-persistence": "^0.2",
+		"68publishers/event-dispatcher-extra": "^1.0",
+		"68publishers/file-storage": "^0.1",
+		"68publishers/smart-nette-component": "^0.2",
+		"68publishers/translation-bridge": "^1.2",
+		"nette/application": "^3.0.6",
+		"nette/di": "^3.0.3",
+		"nette/forms": "^3.0",
+		"nette/utils": "^3.0",
+		"ramsey/uuid": "^4.0"
 	},
 	"require-dev": {
+		"roave/security-advisories": "dev-master",
 		"friendsofphp/php-cs-fixer": "^2.0",
-		"nette/tester": "^1.7",
-		"68publishers/notification-bundle": "^0.1",
-		"gedmo/doctrine-extensions": "^2.4"
+		"nette/tester": "^2.3.4",
+		"68publishers/notification-bundle": "^0.2",
+		"gedmo/doctrine-extensions": "^2.4",
+		"68publishers/image-storage": "^0.5"
 	},
 	"suggest": {
-		"gedmo/doctrine-extensions": "If you want to use soft-deletable images.",
-		"68publishers/notification-bundle": "For automatic notifications (flash message, toastr) on image upload, deletion etc."
+		"gedmo/doctrine-extensions": "If you want to use soft-deletable files.",
+		"68publishers/notification-bundle": "For automatic notifications (flash message, toastr) on file upload, deletion etc.",
+		"68publishers/image-storage": "Use combination of file-storage and image-storage to better management of images!"
+	},
+	"conflict": {
+		"68publishers/image-storage": "<0.5"
 	},
 	"autoload": {
-		"classmap": ["src/"],
-		"files": []
+		"psr-4": {
+			"SixtyEightPublishers\\FileBundle\\": "src/"
+		}
 	},
 	"autoload-dev": {
-		"classmap": ["tests/"],
-		"files": []
+		"psr-4": {
+			"SixtyEightPublishers\\FileBundle\\Tests\\": "tests/"
+		}
+	},
+	"config": {
+		"sort-packages": true
+	},
+	"scripts": {
+		"tests": [
+			"@tests:lowest",
+			"@tests:highest"
+		],
+		"tests:lowest" : [
+			"@composer update --no-progress --prefer-dist --prefer-lowest --prefer-stable",
+			"vendor/bin/tester ./tests"
+		],
+		"tests:highest" : [
+			"@composer update --no-progress --prefer-dist --prefer-stable",
+			"vendor/bin/tester ./tests"
+		]
 	}
 }

src/Action/AbstractAction.php

@@ -2,15 +2,13 @@
 
 declare(strict_types=1);
 
-namespace SixtyEightPublishers\ImageBundle\Action;
+namespace SixtyEightPublishers\FileBundle\Action;
 
-use Nette;
-use SixtyEightPublishers;
+use SixtyEightPublishers\FileBundle\Entity\FileInterface;
+use SixtyEightPublishers\FileBundle\Storage\DataStorageInterface;
 
-abstract class AbstractAction implements IAction
+abstract class AbstractAction implements ActionInterface
 {
-	use Nette\SmartObject;
-
 	/** @var string|NULL */
 	protected $label;
 
@@ -22,13 +20,6 @@ public function __construct(?string $label = NULL)
 		$this->label = $label;
 	}
 
-	/**
-	 * @return string
-	 */
-	abstract protected function getManipulatorClass(): string;
-
-	/*************** interface \AppBundle\Control\ImageManager\Action\AbstractAction ***************/
-
 	/**
 	 * {@inheritdoc}
 	 */
@@ -40,10 +31,23 @@ public function getLabel(): string
 	/**
 	 * {@inheritdoc}
 	 */
-	public function canBeUsed(SixtyEightPublishers\ImageBundle\Storage\IDataStorage $dataStorage): bool
+	public function isImplemented(DataStorageInterface $dataStorage): bool
 	{
 		$manipulatorClass = $this->getManipulatorClass();
 
 		return $dataStorage->hasManipulator($manipulatorClass);
 	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isApplicableOnFile(FileInterface $file, DataStorageInterface $dataStorage): bool
+	{
+		return TRUE;
+	}
+
+	/**
+	 * @return string
+	 */
+	abstract protected function getManipulatorClass(): string;
 }

src/Action/ActionInterface.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SixtyEightPublishers\FileBundle\Action;
+
+use SixtyEightPublishers\FileBundle\Entity\FileInterface;
+use SixtyEightPublishers\FileBundle\Storage\DataStorageInterface;
+
+interface ActionInterface
+{
+	/**
+	 * @return string
+	 */
+	public function getName(): string;
+
+	/**
+	 * @return string
+	 */
+	public function getLabel(): string;
+
+	/**
+	 * @param \SixtyEightPublishers\FileBundle\Storage\DataStorageInterface $storage
+	 *
+	 * @return bool
+	 */
+	public function isImplemented(DataStorageInterface $storage): bool;
+
+	/**
+	 * @param \SixtyEightPublishers\FileBundle\Entity\FileInterface         $file
+	 * @param \SixtyEightPublishers\FileBundle\Storage\DataStorageInterface $dataStorage
+	 *
+	 * @return bool
+	 */
+	public function isApplicableOnFile(FileInterface $file, DataStorageInterface $dataStorage): bool;
+
+	/**
+	 * @param \SixtyEightPublishers\FileBundle\Storage\DataStorageInterface $dataStorage
+	 * @param \SixtyEightPublishers\FileBundle\Entity\FileInterface         $file
+	 *
+	 * @return void
+	 * @throws \SixtyEightPublishers\FileBundle\Exception\FileManipulationException
+	 */
+	public function run(DataStorageInterface $dataStorage, FileInterface $file): void;
+}