From 5ed3b0188962d4aca9f50e59312cfec9a1e79e71 Mon Sep 17 00:00:00 2001 From: Netkas Date: Fri, 30 Dec 2022 04:26:01 -0500 Subject: [PATCH] Moved instructions to it's own namespace --- .../{Program => }/Instructions/Arithmetic/Absolute.php | 2 +- .../Objects/{Program => }/Instructions/Arithmetic/Divide.php | 2 +- .../Objects/{Program => }/Instructions/Arithmetic/Floor.php | 2 +- .../Objects/{Program => }/Instructions/Arithmetic/Modulo.php | 4 ++-- .../{Program => }/Instructions/Arithmetic/Multiply.php | 2 +- .../Objects/{Program => }/Instructions/Arithmetic/Power.php | 2 +- .../Objects/{Program => }/Instructions/Arithmetic/Round.php | 2 +- .../{Program => }/Instructions/Arithmetic/SquareRoot.php | 2 +- .../{Program => }/Instructions/Arithmetic/Subtract.php | 2 +- .../Objects/{Program => }/Instructions/Arithmetic/Sum.php | 2 +- src/RTEX/Objects/{Program => }/Instructions/Base/ArrayGet.php | 2 +- src/RTEX/Objects/{Program => }/Instructions/Base/ArraySet.php | 2 +- .../Objects/{Program => }/Instructions/Base/GetVariable.php | 2 +- src/RTEX/Objects/{Program => }/Instructions/Base/Invoke.php | 2 +- .../Objects/{Program => }/Instructions/Base/SetVariable.php | 2 +- .../Objects/{Program => }/Instructions/Comparators/Equals.php | 2 +- .../{Program => }/Instructions/Comparators/GreaterThan.php | 2 +- .../Instructions/Comparators/GreaterThanOrEqual.php | 2 +- .../{Program => }/Instructions/Comparators/LessThan.php | 2 +- .../Instructions/Comparators/LessThanOrEqual.php | 2 +- .../{Program => }/Instructions/Comparators/NotEquals.php | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) rename src/RTEX/Objects/{Program => }/Instructions/Arithmetic/Absolute.php (97%) rename src/RTEX/Objects/{Program => }/Instructions/Arithmetic/Divide.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Arithmetic/Floor.php (97%) rename src/RTEX/Objects/{Program => }/Instructions/Arithmetic/Modulo.php (97%) rename src/RTEX/Objects/{Program => }/Instructions/Arithmetic/Multiply.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Arithmetic/Power.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Arithmetic/Round.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Arithmetic/SquareRoot.php (97%) rename src/RTEX/Objects/{Program => }/Instructions/Arithmetic/Subtract.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Arithmetic/Sum.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Base/ArrayGet.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Base/ArraySet.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Base/GetVariable.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Base/Invoke.php (99%) rename src/RTEX/Objects/{Program => }/Instructions/Base/SetVariable.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Comparators/Equals.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Comparators/GreaterThan.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Comparators/GreaterThanOrEqual.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Comparators/LessThan.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Comparators/LessThanOrEqual.php (98%) rename src/RTEX/Objects/{Program => }/Instructions/Comparators/NotEquals.php (98%) diff --git a/src/RTEX/Objects/Program/Instructions/Arithmetic/Absolute.php b/src/RTEX/Objects/Instructions/Arithmetic/Absolute.php similarity index 97% rename from src/RTEX/Objects/Program/Instructions/Arithmetic/Absolute.php rename to src/RTEX/Objects/Instructions/Arithmetic/Absolute.php index ab57cbb..14e3b9b 100644 --- a/src/RTEX/Objects/Program/Instructions/Arithmetic/Absolute.php +++ b/src/RTEX/Objects/Instructions/Arithmetic/Absolute.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Arithmetic; + namespace RTEX\Objects\Instructions\Arithmetic; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Arithmetic/Divide.php b/src/RTEX/Objects/Instructions/Arithmetic/Divide.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Arithmetic/Divide.php rename to src/RTEX/Objects/Instructions/Arithmetic/Divide.php index 3ba6f29..db4a73f 100644 --- a/src/RTEX/Objects/Program/Instructions/Arithmetic/Divide.php +++ b/src/RTEX/Objects/Instructions/Arithmetic/Divide.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Arithmetic; + namespace RTEX\Objects\Instructions\Arithmetic; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Arithmetic/Floor.php b/src/RTEX/Objects/Instructions/Arithmetic/Floor.php similarity index 97% rename from src/RTEX/Objects/Program/Instructions/Arithmetic/Floor.php rename to src/RTEX/Objects/Instructions/Arithmetic/Floor.php index 36d5128..9bf3b70 100644 --- a/src/RTEX/Objects/Program/Instructions/Arithmetic/Floor.php +++ b/src/RTEX/Objects/Instructions/Arithmetic/Floor.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Arithmetic; + namespace RTEX\Objects\Instructions\Arithmetic; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Arithmetic/Modulo.php b/src/RTEX/Objects/Instructions/Arithmetic/Modulo.php similarity index 97% rename from src/RTEX/Objects/Program/Instructions/Arithmetic/Modulo.php rename to src/RTEX/Objects/Instructions/Arithmetic/Modulo.php index 71db5ec..383c63f 100644 --- a/src/RTEX/Objects/Program/Instructions/Arithmetic/Modulo.php +++ b/src/RTEX/Objects/Instructions/Arithmetic/Modulo.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Arithmetic; + namespace RTEX\Objects\Instructions\Arithmetic; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; @@ -90,7 +90,7 @@ public function __toString(): string { return sprintf( - self::getType() . ' %s % %s', + self::getType() . ' %s %% %s', Utilities::entityToString($this->A), Utilities::entityToString($this->B) ); diff --git a/src/RTEX/Objects/Program/Instructions/Arithmetic/Multiply.php b/src/RTEX/Objects/Instructions/Arithmetic/Multiply.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Arithmetic/Multiply.php rename to src/RTEX/Objects/Instructions/Arithmetic/Multiply.php index c079a03..94473d2 100644 --- a/src/RTEX/Objects/Program/Instructions/Arithmetic/Multiply.php +++ b/src/RTEX/Objects/Instructions/Arithmetic/Multiply.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Arithmetic; + namespace RTEX\Objects\Instructions\Arithmetic; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Arithmetic/Power.php b/src/RTEX/Objects/Instructions/Arithmetic/Power.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Arithmetic/Power.php rename to src/RTEX/Objects/Instructions/Arithmetic/Power.php index 4d938d6..1719102 100644 --- a/src/RTEX/Objects/Program/Instructions/Arithmetic/Power.php +++ b/src/RTEX/Objects/Instructions/Arithmetic/Power.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Arithmetic; + namespace RTEX\Objects\Instructions\Arithmetic; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Arithmetic/Round.php b/src/RTEX/Objects/Instructions/Arithmetic/Round.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Arithmetic/Round.php rename to src/RTEX/Objects/Instructions/Arithmetic/Round.php index 4436ff2..ad9ec83 100644 --- a/src/RTEX/Objects/Program/Instructions/Arithmetic/Round.php +++ b/src/RTEX/Objects/Instructions/Arithmetic/Round.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Arithmetic; + namespace RTEX\Objects\Instructions\Arithmetic; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Arithmetic/SquareRoot.php b/src/RTEX/Objects/Instructions/Arithmetic/SquareRoot.php similarity index 97% rename from src/RTEX/Objects/Program/Instructions/Arithmetic/SquareRoot.php rename to src/RTEX/Objects/Instructions/Arithmetic/SquareRoot.php index 98f6796..e2332b1 100644 --- a/src/RTEX/Objects/Program/Instructions/Arithmetic/SquareRoot.php +++ b/src/RTEX/Objects/Instructions/Arithmetic/SquareRoot.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Arithmetic; + namespace RTEX\Objects\Instructions\Arithmetic; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Arithmetic/Subtract.php b/src/RTEX/Objects/Instructions/Arithmetic/Subtract.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Arithmetic/Subtract.php rename to src/RTEX/Objects/Instructions/Arithmetic/Subtract.php index 02579df..b017af1 100644 --- a/src/RTEX/Objects/Program/Instructions/Arithmetic/Subtract.php +++ b/src/RTEX/Objects/Instructions/Arithmetic/Subtract.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Arithmetic; + namespace RTEX\Objects\Instructions\Arithmetic; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Arithmetic/Sum.php b/src/RTEX/Objects/Instructions/Arithmetic/Sum.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Arithmetic/Sum.php rename to src/RTEX/Objects/Instructions/Arithmetic/Sum.php index 2a132d5..15a951f 100644 --- a/src/RTEX/Objects/Program/Instructions/Arithmetic/Sum.php +++ b/src/RTEX/Objects/Instructions/Arithmetic/Sum.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Arithmetic; + namespace RTEX\Objects\Instructions\Arithmetic; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Base/ArrayGet.php b/src/RTEX/Objects/Instructions/Base/ArrayGet.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Base/ArrayGet.php rename to src/RTEX/Objects/Instructions/Base/ArrayGet.php index b0b34ff..4522b74 100644 --- a/src/RTEX/Objects/Program/Instructions/Base/ArrayGet.php +++ b/src/RTEX/Objects/Instructions/Base/ArrayGet.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Base; + namespace RTEX\Objects\Instructions\Base; use RTEX\Abstracts\InstructionType; use RTEX\Abstracts\RegexPatterns; diff --git a/src/RTEX/Objects/Program/Instructions/Base/ArraySet.php b/src/RTEX/Objects/Instructions/Base/ArraySet.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Base/ArraySet.php rename to src/RTEX/Objects/Instructions/Base/ArraySet.php index 46c1b5d..4973345 100644 --- a/src/RTEX/Objects/Program/Instructions/Base/ArraySet.php +++ b/src/RTEX/Objects/Instructions/Base/ArraySet.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Base; + namespace RTEX\Objects\Instructions\Base; use RTEX\Abstracts\InstructionType; use RTEX\Abstracts\RegexPatterns; diff --git a/src/RTEX/Objects/Program/Instructions/Base/GetVariable.php b/src/RTEX/Objects/Instructions/Base/GetVariable.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Base/GetVariable.php rename to src/RTEX/Objects/Instructions/Base/GetVariable.php index e636404..deecbfa 100644 --- a/src/RTEX/Objects/Program/Instructions/Base/GetVariable.php +++ b/src/RTEX/Objects/Instructions/Base/GetVariable.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Base; + namespace RTEX\Objects\Instructions\Base; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Base/Invoke.php b/src/RTEX/Objects/Instructions/Base/Invoke.php similarity index 99% rename from src/RTEX/Objects/Program/Instructions/Base/Invoke.php rename to src/RTEX/Objects/Instructions/Base/Invoke.php index 123f2ed..8ec2cc0 100644 --- a/src/RTEX/Objects/Program/Instructions/Base/Invoke.php +++ b/src/RTEX/Objects/Instructions/Base/Invoke.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Base; + namespace RTEX\Objects\Instructions\Base; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Base/SetVariable.php b/src/RTEX/Objects/Instructions/Base/SetVariable.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Base/SetVariable.php rename to src/RTEX/Objects/Instructions/Base/SetVariable.php index cae9156..8cc40f6 100644 --- a/src/RTEX/Objects/Program/Instructions/Base/SetVariable.php +++ b/src/RTEX/Objects/Instructions/Base/SetVariable.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Base; + namespace RTEX\Objects\Instructions\Base; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Comparators/Equals.php b/src/RTEX/Objects/Instructions/Comparators/Equals.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Comparators/Equals.php rename to src/RTEX/Objects/Instructions/Comparators/Equals.php index 483ce70..b89b437 100644 --- a/src/RTEX/Objects/Program/Instructions/Comparators/Equals.php +++ b/src/RTEX/Objects/Instructions/Comparators/Equals.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Comparators; + namespace RTEX\Objects\Instructions\Comparators; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Comparators/GreaterThan.php b/src/RTEX/Objects/Instructions/Comparators/GreaterThan.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Comparators/GreaterThan.php rename to src/RTEX/Objects/Instructions/Comparators/GreaterThan.php index 6cb83a8..0dffa6e 100644 --- a/src/RTEX/Objects/Program/Instructions/Comparators/GreaterThan.php +++ b/src/RTEX/Objects/Instructions/Comparators/GreaterThan.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Comparators; + namespace RTEX\Objects\Instructions\Comparators; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Comparators/GreaterThanOrEqual.php b/src/RTEX/Objects/Instructions/Comparators/GreaterThanOrEqual.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Comparators/GreaterThanOrEqual.php rename to src/RTEX/Objects/Instructions/Comparators/GreaterThanOrEqual.php index 29b67ce..40c10c8 100644 --- a/src/RTEX/Objects/Program/Instructions/Comparators/GreaterThanOrEqual.php +++ b/src/RTEX/Objects/Instructions/Comparators/GreaterThanOrEqual.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Comparators; + namespace RTEX\Objects\Instructions\Comparators; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Comparators/LessThan.php b/src/RTEX/Objects/Instructions/Comparators/LessThan.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Comparators/LessThan.php rename to src/RTEX/Objects/Instructions/Comparators/LessThan.php index 55dd729..baa165d 100644 --- a/src/RTEX/Objects/Program/Instructions/Comparators/LessThan.php +++ b/src/RTEX/Objects/Instructions/Comparators/LessThan.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Comparators; + namespace RTEX\Objects\Instructions\Comparators; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Comparators/LessThanOrEqual.php b/src/RTEX/Objects/Instructions/Comparators/LessThanOrEqual.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Comparators/LessThanOrEqual.php rename to src/RTEX/Objects/Instructions/Comparators/LessThanOrEqual.php index e66f49f..7e9ae75 100644 --- a/src/RTEX/Objects/Program/Instructions/Comparators/LessThanOrEqual.php +++ b/src/RTEX/Objects/Instructions/Comparators/LessThanOrEqual.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Comparators; + namespace RTEX\Objects\Instructions\Comparators; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder; diff --git a/src/RTEX/Objects/Program/Instructions/Comparators/NotEquals.php b/src/RTEX/Objects/Instructions/Comparators/NotEquals.php similarity index 98% rename from src/RTEX/Objects/Program/Instructions/Comparators/NotEquals.php rename to src/RTEX/Objects/Instructions/Comparators/NotEquals.php index c0c9d6b..9b5fc89 100644 --- a/src/RTEX/Objects/Program/Instructions/Comparators/NotEquals.php +++ b/src/RTEX/Objects/Instructions/Comparators/NotEquals.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace RTEX\Objects\Program\Instructions\Comparators; + namespace RTEX\Objects\Instructions\Comparators; use RTEX\Abstracts\InstructionType; use RTEX\Classes\InstructionBuilder;