Fix deprecations (#1934)

Author: jderusse

src/Generator/ClientGenerator.php

@@ -15,7 +15,7 @@
 use AsyncAws\Core\AwsError\XmlAwsErrorFactory;
 use AsyncAws\Core\Configuration;
 use AsyncAws\Core\Exception\UnsupportedRegion;
-use Nette\PhpGenerator\ClassType;
+use Nette\PhpGenerator\Visibility;
 
 /**
  * Generate API client.
@@ -252,7 +252,7 @@ public function getVersion() {
 
         $classBuilder->addMethod('getEndpointMetadata')
             ->setReturnType('array')
-            ->setVisibility(ClassType::VISIBILITY_PROTECTED)
+            ->setVisibility(Visibility::Protected)
             ->setBody(strtr($body, ['"$region"' => '$region']))
             ->addParameter('region')
                 ->setType('string')
@@ -287,7 +287,7 @@ public function getVersion() {
         $errorFactoryBase = basename(str_replace('\\', '/', $errorFactory));
         $classBuilder->addMethod('getAwsErrorFactory')
             ->setReturnType(AwsErrorFactoryInterface::class)
-            ->setVisibility(ClassType::VISIBILITY_PROTECTED)
+            ->setVisibility(Visibility::Protected)
             ->setBody("return new $errorFactoryBase();")
         ;
 

src/Generator/EnumGenerator.php

@@ -8,7 +8,7 @@
 use AsyncAws\CodeGenerator\Generator\Naming\ClassName;
 use AsyncAws\CodeGenerator\Generator\Naming\NamespaceRegistry;
 use AsyncAws\CodeGenerator\Generator\PhpGenerator\ClassRegistry;
-use Nette\PhpGenerator\ClassType;
+use Nette\PhpGenerator\Visibility;
 
 /**
  * Generate Enum shapeused by Input and Result classes.
@@ -64,7 +64,7 @@ public function generate(Shape $shape): ClassName
         ksort($consts);
         $availableConsts = [];
         foreach ($consts as $constName => $constValue) {
-            $classBuilder->addConstant($constName, $constValue)->setVisibility(ClassType::VISIBILITY_PUBLIC);
+            $classBuilder->addConstant($constName, $constValue)->setVisibility(Visibility::Public);
             $availableConsts[] = 'self::' . $constName . ' => true';
         }
         $classBuilder->addMethod('exists')

src/Generator/OperationGenerator.php

@@ -13,8 +13,8 @@
 use AsyncAws\CodeGenerator\Generator\PhpGenerator\ClassRegistry;
 use AsyncAws\Core\RequestContext;
 use AsyncAws\Core\Result;
-use Nette\PhpGenerator\ClassType;
 use Nette\PhpGenerator\Method;
+use Nette\PhpGenerator\Visibility;
 
 /**
  * Generate API client methods and result classes.
@@ -156,7 +156,7 @@ public function generate(Operation $operation): void
 
         if ($operation->isEndpointOperation()) {
             $classBuilder->addMethod('discoverEndpoints')
-                ->setVisibility(ClassType::VISIBILITY_PROTECTED)
+                ->setVisibility(Visibility::Protected)
                 ->setReturnType('array')
                 ->setBody(strtr('
                     return $this->METHOD($region ? ["@region" => $region] : [])->getEndpoints();

src/Generator/ResponseParser/RestJsonParser.php

@@ -16,8 +16,8 @@
 use AsyncAws\CodeGenerator\Generator\GeneratorHelper;
 use AsyncAws\CodeGenerator\Generator\Naming\ClassName;
 use AsyncAws\CodeGenerator\Generator\Naming\NamespaceRegistry;
-use Nette\PhpGenerator\ClassType;
 use Nette\PhpGenerator\Method;
+use Nette\PhpGenerator\Visibility;
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -433,7 +433,7 @@ private function parseResponseMap(MapShape $shape, string $input, bool $required
     private function createPopulateMethod(string $functionName, string $body, Shape $shape): Method
     {
         $method = new Method($functionName);
-        $method->setVisibility(ClassType::VISIBILITY_PRIVATE)
+        $method->setVisibility(Visibility::Private)
             ->setBody($body)
             ->addParameter('json')
                 ->setType('array')

src/Generator/ResponseParser/RestXmlParser.php

@@ -16,8 +16,8 @@
 use AsyncAws\CodeGenerator\Generator\GeneratorHelper;
 use AsyncAws\CodeGenerator\Generator\Naming\ClassName;
 use AsyncAws\CodeGenerator\Generator\Naming\NamespaceRegistry;
-use Nette\PhpGenerator\ClassType;
 use Nette\PhpGenerator\Method;
+use Nette\PhpGenerator\Visibility;
 
 /**
  * @author Jérémy Derussé <[email protected]>
@@ -384,7 +384,7 @@ private function parseXmlResponseMap(MapShape $shape, string $input, bool $requi
     private function createPopulateMethod(string $functionName, string $body, Shape $shape): Method
     {
         $method = new Method($functionName);
-        $method->setVisibility(ClassType::VISIBILITY_PRIVATE)
+        $method->setVisibility(Visibility::Private)
             ->setReturnType('array')
             ->setBody($body)
             ->addParameter('xml')

src/Generator/TestGenerator.php

@@ -19,7 +19,7 @@
 use AsyncAws\Core\Response;
 use AsyncAws\Core\Test\Http\SimpleMockedResponse;
 use AsyncAws\Core\Test\TestCase;
-use Nette\PhpGenerator\ClassType;
+use Nette\PhpGenerator\Visibility;
 use PHPUnit\Framework\TestCase as PHPUnitTestCase;
 use Psr\Log\NullLogger;
 use Symfony\Component\HttpClient\MockHttpClient;
@@ -404,7 +404,7 @@ private function createClientTestClass(ClassName $testClassName, Operation $oper
 
         $classBuilder->setExtends(TestCase::class);
         $classBuilder->addMethod('getClient')
-            ->setVisibility(ClassType::VISIBILITY_PRIVATE)
+            ->setVisibility(Visibility::Private)
             ->setReturnType($clientClassName->getFqdn())
             ->setBody(strtr('
     MARKER

src/Generator/WaiterGenerator.php

@@ -22,7 +22,7 @@
 use AsyncAws\Core\Response;
 use AsyncAws\Core\Result;
 use AsyncAws\Core\Waiter as WaiterResult;
-use Nette\PhpGenerator\ClassType;
+use Nette\PhpGenerator\Visibility;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
 /**
@@ -143,9 +143,9 @@ private function generateWaiterResult(Waiter $waiter): ClassName
         $classBuilder = $this->classRegistry->register($className->getFqdn());
 
         $classBuilder->addConstant('WAIT_TIMEOUT', (float) ($waiter->getMaxAttempts() * $waiter->getDelay()))
-            ->setVisibility(ClassType::VISIBILITY_PROTECTED);
+            ->setVisibility(Visibility::Protected);
         $classBuilder->addConstant('WAIT_DELAY', (float) $waiter->getDelay())
-            ->setVisibility(ClassType::VISIBILITY_PROTECTED);
+            ->setVisibility(Visibility::Protected);
 
         $classBuilder->addUse(WaiterResult::class);
         $classBuilder->addUse(Result::class);
@@ -162,7 +162,7 @@ private function generateWaiterResult(Waiter $waiter): ClassName
 
         $classBuilder->addMethod('refreshState')
             ->setReturnType(WaiterResult::class)
-            ->setVisibility(ClassType::VISIBILITY_PROTECTED)
+            ->setVisibility(Visibility::Protected)
             ->setBody(strtr('
                 if (!$this->awsClient instanceOf CLIENT_CLASSNAME) {
                     throw new InvalidArgument(\'missing client injected in waiter result\');