Added PHP 8.1 into composer.json and support warning into the README

68publishers · Jan 3, 2023 · 87d25da · 87d25da
1 parent 5bd3be9
commit 87d25da
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+> :warning: Warning! This package does not have active support, it exists only for the historical needs of the author.
+
 # User
 
 [![Build Status][ico-travis]][link-travis]

diff --git a/composer.json b/composer.json
@@ -14,12 +14,12 @@
 		}
 	],
 	"require": {
-		"php": "^7.3",
-		"68publishers/doctrine-bridge": "^0.1.1",
-		"68publishers/doctrine-persistence": "^0.2.6",
-		"68publishers/doctrine-query-objects": "^0.1",
-		"68publishers/smart-nette-component": "^0.2",
-		"68publishers/translation-bridge": "^1.2",
+		"php": "^8.1",
+		"68publishers/doctrine-bridge": "^1.0",
+		"68publishers/doctrine-persistence": "^0.3",
+		"68publishers/doctrine-query-objects": "^0.2",
+		"68publishers/smart-nette-component": "^1.0",
+		"68publishers/translation-bridge": "^2.0",
 		"matomo/device-detector": "^4.0",
 		"nette/application": "^3.0.6",
 		"nette/di": "^3.0.3",
@@ -28,14 +28,14 @@
 		"nette/security": "^3.0",
 		"nette/utils": "^3.0",
 		"ramsey/uuid": "^4.1",
-		"symfony/event-dispatcher": "^5.1",
+		"symfony/event-dispatcher": "^5.1 || ^6.0",
 		"tracy/tracy": "^2.6"
 	},
 	"require-dev": {
 		"roave/security-advisories": "dev-master",
 		"friendsofphp/php-cs-fixer": "^2.0",
 		"nette/tester": "^2.2",
-		"contributte/mailing": "^0.4",
+		"contributte/mailing": "^0.5",
 		"psr/log": "^1.0"
 	},
 	"suggest": {

diff --git a/src/Authentication/Control/SignIn/SignInControl.php b/src/Authentication/Control/SignIn/SignInControl.php
@@ -8,11 +8,12 @@
 use Nette\Application\UI\Form;
 use Nette\Security\IAuthenticator;
 use Nette\Security\AuthenticationException;
-use SixtyEightPublishers\SmartNetteComponent\UI\Control;
+use Nette\Application\UI\Control;
 use SixtyEightPublishers\User\Common\Logger\LoggerInterface;
 use SixtyEightPublishers\TranslationBridge\TranslatorAwareTrait;
 use SixtyEightPublishers\TranslationBridge\TranslatorAwareInterface;
 use SixtyEightPublishers\User\Authentication\Authenticator\AuthenticatorMount;
+use SixtyEightPublishers\SmartNetteComponent\Bridge\Nette\Application\TemplateResolverTrait;
 
 /**
  * @method void onLoggedIn()
@@ -22,6 +23,7 @@
 final class SignInControl extends Control implements TranslatorAwareInterface
 {
 	use TranslatorAwareTrait;
+	use TemplateResolverTrait;
 
 	/** @var \Nette\Security\User  */
 	private $user;

diff --git a/src/Authentication/DI/AuthenticationExtension.php b/src/Authentication/DI/AuthenticationExtension.php
@@ -8,18 +8,18 @@
 use Nette\Schema\Schema;
 use Nette\Security\IAuthenticator;
 use Nette\DI\Definitions\Statement;
-use SixtyEightPublishers\DoctrineBridge\DI\TargetEntity;
 use SixtyEightPublishers\User\Common\DI\CommonExtension;
 use SixtyEightPublishers\User\DI\AbstractCompilerExtensionPass;
 use SixtyEightPublishers\User\Authentication\Entity\UserInterface;
 use SixtyEightPublishers\User\Authentication\Csrf\CsrfTokenFactory;
+use SixtyEightPublishers\DoctrineBridge\Bridge\Nette\DI\TargetEntity;
 use SixtyEightPublishers\User\Common\Exception\ConfigurationException;
-use SixtyEightPublishers\DoctrineBridge\DI\TargetEntityProviderInterface;
 use SixtyEightPublishers\User\Authentication\Authenticator\Authenticator;
 use SixtyEightPublishers\User\Authentication\Control\SignIn\SignInControl;
-use SixtyEightPublishers\TranslationBridge\DI\TranslationProviderInterface;
 use SixtyEightPublishers\User\Authentication\Csrf\CsrfTokenFactoryInterface;
 use SixtyEightPublishers\User\Authentication\Query\AuthenticatorQueryObject;
+use SixtyEightPublishers\DoctrineBridge\Bridge\Nette\DI\TargetEntityProviderInterface;
+use SixtyEightPublishers\TranslationBridge\Bridge\Nette\DI\TranslationProviderInterface;
 use SixtyEightPublishers\User\Authentication\Control\SignIn\SignInControlFactoryInterface;
 use SixtyEightPublishers\User\Authentication\Query\AuthenticatorQueryObjectFactoryInterface;
 

diff --git a/src/Common/DI/CommonExtension.php b/src/Common/DI/CommonExtension.php
@@ -10,20 +10,20 @@
 use Nette\DI\CompilerExtension;
 use Nette\DI\Definitions\Statement;
 use SixtyEightPublishers\User\Common\UserMapping;
-use SixtyEightPublishers\DoctrineBridge\DI\DatabaseType;
-use SixtyEightPublishers\DoctrineBridge\DI\TargetEntity;
 use SixtyEightPublishers\User\Common\Logger\TracyLogger;
 use SixtyEightPublishers\User\Common\Mail\NullMailSender;
 use SixtyEightPublishers\User\Common\Entity\UserInterface;
 use SixtyEightPublishers\User\Common\Logger\LoggerInterface;
 use SixtyEightPublishers\User\Common\Mail\MailSenderInterface;
 use SixtyEightPublishers\User\DI\AbstractCompilerExtensionPass;
 use SixtyEightPublishers\User\Common\DbalType\Password\PasswordType;
+use SixtyEightPublishers\DoctrineBridge\Bridge\Nette\DI\TargetEntity;
+use SixtyEightPublishers\DoctrineBridge\Bridge\Nette\DI\DatabaseType;
 use SixtyEightPublishers\User\Common\Exception\ConfigurationException;
-use SixtyEightPublishers\DoctrineBridge\DI\DatabaseTypeProviderInterface;
-use SixtyEightPublishers\DoctrineBridge\DI\TargetEntityProviderInterface;
 use SixtyEightPublishers\User\Common\DbalType\Password\PasswordInterface;
 use SixtyEightPublishers\User\Common\PasswordHashStrategy\DefaultPasswordHashStrategy;
+use SixtyEightPublishers\DoctrineBridge\Bridge\Nette\DI\TargetEntityProviderInterface;
+use SixtyEightPublishers\DoctrineBridge\Bridge\Nette\DI\DatabaseTypeProviderInterface;
 use SixtyEightPublishers\User\Common\PasswordHashStrategy\PasswordHashStrategyInterface;
 
 final class CommonExtension extends AbstractCompilerExtensionPass implements TargetEntityProviderInterface, DatabaseTypeProviderInterface

diff --git a/src/DI/UserBundleExtension.php b/src/DI/UserBundleExtension.php
@@ -13,11 +13,11 @@
 use SixtyEightPublishers\User\Authentication\DI\AuthenticationExtension;
 use SixtyEightPublishers\User\Common\Exception\StopPropagationException;
 use SixtyEightPublishers\User\ForgotPassword\DI\ForgotPasswordExtension;
-use SixtyEightPublishers\DoctrineBridge\DI\DatabaseTypeProviderInterface;
-use SixtyEightPublishers\DoctrineBridge\DI\TargetEntityProviderInterface;
-use SixtyEightPublishers\DoctrineBridge\DI\EntityMappingProviderInterface;
-use SixtyEightPublishers\TranslationBridge\DI\TranslationProviderInterface;
 use SixtyEightPublishers\User\DoctrineIdentity\DI\DoctrineIdentityExtension;
+use SixtyEightPublishers\DoctrineBridge\Bridge\Nette\DI\DatabaseTypeProviderInterface;
+use SixtyEightPublishers\DoctrineBridge\Bridge\Nette\DI\TargetEntityProviderInterface;
+use SixtyEightPublishers\DoctrineBridge\Bridge\Nette\DI\EntityMappingProviderInterface;
+use SixtyEightPublishers\TranslationBridge\Bridge\Nette\DI\TranslationProviderInterface;
 
 final class UserBundleExtension extends CompilerExtension implements DatabaseTypeProviderInterface, EntityMappingProviderInterface, TargetEntityProviderInterface, TranslationProviderInterface
 {

diff --git a/src/ForgotPassword/Control/ForgotPassword/ForgotPasswordControl.php b/src/ForgotPassword/Control/ForgotPassword/ForgotPasswordControl.php
@@ -5,12 +5,13 @@
 namespace SixtyEightPublishers\User\ForgotPassword\Control\ForgotPassword;
 
 use Nette\Application\UI\Form;
-use SixtyEightPublishers\SmartNetteComponent\UI\Control;
+use Nette\Application\UI\Control;
 use SixtyEightPublishers\TranslationBridge\TranslatorAwareTrait;
 use SixtyEightPublishers\TranslationBridge\TranslatorAwareInterface;
 use SixtyEightPublishers\User\ForgotPassword\Entity\PasswordRequestInterface;
 use SixtyEightPublishers\User\ForgotPassword\Exception\PasswordRequestCreationException;
 use SixtyEightPublishers\User\ForgotPassword\PasswordRequest\PasswordRequestSenderInterface;
+use SixtyEightPublishers\SmartNetteComponent\Bridge\Nette\Application\TemplateResolverTrait;
 
 /**
  * @method void onSend(string $email, ?PasswordRequestInterface $passwordRequest)
@@ -20,6 +21,7 @@
 class ForgotPasswordControl extends Control implements TranslatorAwareInterface
 {
 	use TranslatorAwareTrait;
+	use TemplateResolverTrait;
 
 	/** @var \SixtyEightPublishers\User\ForgotPassword\PasswordRequest\PasswordRequestSenderInterface  */
 	private $passwordRequestSender;

diff --git a/src/ForgotPassword/Control/ResetPassword/ResetPasswordControl.php b/src/ForgotPassword/Control/ResetPassword/ResetPasswordControl.php
@@ -7,13 +7,14 @@
 use Throwable;
 use Nette\Security\User;
 use Nette\Application\UI\Form;
-use SixtyEightPublishers\SmartNetteComponent\UI\Control;
+use Nette\Application\UI\Control;
 use SixtyEightPublishers\User\Common\Logger\LoggerInterface;
 use SixtyEightPublishers\TranslationBridge\TranslatorAwareTrait;
 use SixtyEightPublishers\TranslationBridge\TranslatorAwareInterface;
 use SixtyEightPublishers\User\ForgotPassword\Entity\PasswordRequestInterface;
 use SixtyEightPublishers\User\ForgotPassword\Mail\PasswordHasBeenResetEmailInterface;
 use SixtyEightPublishers\User\ForgotPassword\Exception\PasswordRequestProcessException;
+use SixtyEightPublishers\SmartNetteComponent\Bridge\Nette\Application\TemplateResolverTrait;
 use SixtyEightPublishers\User\ForgotPassword\PasswordRequest\PasswordRequestManagerInterface;
 
 /**
@@ -24,6 +25,7 @@
 class ResetPasswordControl extends Control implements TranslatorAwareInterface
 {
 	use TranslatorAwareTrait;
+	use TemplateResolverTrait;
 
 	/** @var \SixtyEightPublishers\User\ForgotPassword\Entity\PasswordRequestInterface  */
 	private $passwordRequest;

diff --git a/src/ForgotPassword/DI/ForgotPasswordExtension.php b/src/ForgotPassword/DI/ForgotPasswordExtension.php
@@ -8,16 +8,13 @@
 use Nette\Schema\Schema;
 use Nette\PhpGenerator\ClassType;
 use Nette\PhpGenerator\PhpLiteral;
-use SixtyEightPublishers\DoctrineBridge\DI\TargetEntity;
 use SixtyEightPublishers\User\Common\DI\CommonExtension;
-use SixtyEightPublishers\DoctrineBridge\DI\EntityMapping;
 use SixtyEightPublishers\User\DI\AbstractCompilerExtensionPass;
 use SixtyEightPublishers\User\ForgotPassword\Entity\UserInterface;
 use SixtyEightPublishers\User\ForgotPassword\Entity\PasswordRequest;
+use SixtyEightPublishers\DoctrineBridge\Bridge\Nette\DI\TargetEntity;
 use SixtyEightPublishers\User\Common\Exception\ConfigurationException;
-use SixtyEightPublishers\DoctrineBridge\DI\TargetEntityProviderInterface;
-use SixtyEightPublishers\DoctrineBridge\DI\EntityMappingProviderInterface;
-use SixtyEightPublishers\TranslationBridge\DI\TranslationProviderInterface;
+use SixtyEightPublishers\DoctrineBridge\Bridge\Nette\DI\EntityMapping;
 use SixtyEightPublishers\User\ForgotPassword\Mail\ForgotPasswordResetEmail;
 use SixtyEightPublishers\User\ForgotPassword\Mail\PasswordHasBeenResetEmail;
 use SixtyEightPublishers\User\ForgotPassword\Entity\PasswordRequestInterface;
@@ -28,8 +25,11 @@
 use SixtyEightPublishers\User\ForgotPassword\PasswordRequest\PasswordRequestFactory;
 use SixtyEightPublishers\User\ForgotPassword\PasswordRequest\PasswordRequestManager;
 use SixtyEightPublishers\User\ForgotPassword\Mail\PasswordHasBeenResetEmailInterface;
+use SixtyEightPublishers\DoctrineBridge\Bridge\Nette\DI\TargetEntityProviderInterface;
 use SixtyEightPublishers\User\ForgotPassword\Query\FindPasswordRequestByIdsQueryObject;
+use SixtyEightPublishers\DoctrineBridge\Bridge\Nette\DI\EntityMappingProviderInterface;
 use SixtyEightPublishers\User\ForgotPassword\Control\ResetPassword\ResetPasswordControl;
+use SixtyEightPublishers\TranslationBridge\Bridge\Nette\DI\TranslationProviderInterface;
 use SixtyEightPublishers\User\ForgotPassword\Control\ForgotPassword\ForgotPasswordControl;
 use SixtyEightPublishers\User\ForgotPassword\Query\CancelPasswordRequestsByUserQueryObject;
 use SixtyEightPublishers\User\ForgotPassword\Mail\ForgotPasswordNotRegisteredEmailInterface;
@@ -154,7 +154,7 @@ public function afterCompile(ClassType $class): void
 	public function getEntityMappings(): array
 	{
 		return [
-			new EntityMapping(EntityMapping::DRIVER_ANNOTATIONS, 'SixtyEightPublishers\User\ForgotPassword\Entity', __DIR__ . '/../Entity'),
+			new EntityMapping(EntityMapping::DRIVER_ANNOTATION, 'SixtyEightPublishers\User\ForgotPassword\Entity', __DIR__ . '/../Entity'),
 		];
 	}