38264: fix static failures and implement suggested changes

Author: engcom-Dash

app/code/Magento/SalesGraphQl/Model/Formatter/Order.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -20,8 +20,6 @@
  */
 class Order
 {
-    private TimezoneInterface $timezone;
-
     /**
      * @param OrderAddress $orderAddress
      * @param OrderPayments $orderPayments
@@ -30,7 +28,7 @@ class Order
     public function __construct(
         private readonly OrderAddress $orderAddress,
         private readonly OrderPayments $orderPayments,
-        TimezoneInterface $timezone = null
+        private ?TimezoneInterface $timezone = null
     ) {
         $this->timezone = $timezone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
     }

app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -21,10 +21,11 @@
  */
 class CreditMemoComments implements ResolverInterface
 {
-    private TimezoneInterface $timezone;
-
+    /**
+     * @param TimezoneInterface|null $timezone
+     */
     public function __construct(
-        TimezoneInterface $timezone = null
+        private ?TimezoneInterface $timezone = null
     ) {
         $this->timezone = $timezone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
     }

app/code/Magento/SalesGraphQl/Model/Resolver/Invoices.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -22,10 +22,11 @@
  */
 class Invoices implements ResolverInterface
 {
-    private TimezoneInterface $timezone;
-
+    /**
+     * @param TimezoneInterface|null $timezone
+     */
     public function __construct(
-        TimezoneInterface $timezone = null
+        private ?TimezoneInterface $timezone = null
     ) {
         $this->timezone = $timezone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
     }

app/code/Magento/SalesGraphQl/Model/Resolver/Shipments.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -22,10 +22,11 @@
  */
 class Shipments implements ResolverInterface
 {
-    private TimezoneInterface $timezone;
-
+    /**
+     * @param TimezoneInterface|null $timezone
+     */
     public function __construct(
-        TimezoneInterface $timezone = null
+        private ?TimezoneInterface $timezone = null
     ) {
         $this->timezone = $timezone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
     }

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);