csf (also fixed workflow)

CommandString · CommandString · commit 4e8ba1248083 · 2023-11-06T05:04:22.000-05:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '8.1', '8.2' ]
+        php: [ '8.2' ]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/index.php b/index.php
@@ -29,7 +29,7 @@
     $client->on(Client::GENERIC_PACKET, static function (GenericPacket $packet, Client $client) {
         var_dump($packet->getType());
     });
-    
+
     $client->on(Client::DISCONNECT, static function (Client $client) {
         $client->server->logger->info('Client disconnected [' . color(Color::GREEN, $client->getIp()) . ']');
     });
diff --git a/src/Exceptions/CavePHPException.php b/src/Exceptions/CavePHPException.php
@@ -4,6 +4,6 @@
 
 use Exception;
 
-class CavePHPException extends Exception {
-    
-}
+class CavePHPException extends Exception
+{
+}
diff --git a/src/Pools/Pool.php b/src/Pools/Pool.php
@@ -5,20 +5,22 @@
 use CavePHP\Exceptions\CavePHPException;
 use Countable;
 
-abstract class Pool implements Countable {
+abstract class Pool implements Countable
+{
     private array $items = [];
 
     abstract public function isInstance(object $item): bool;
 
-    public function __construct(array $items = []) {
+    public function __construct(array $items = [])
+    {
         $this->fill($items);
     }
 
     public function fill(array $items): void
     {
         foreach ($items as $item) {
             if (!is_object($item) || !$this->isInstance($item)) {
-                throw new CavePHPException("This object is not supported by this collection");
+                throw new CavePHPException('This object is not supported by this collection');
             }
         }
 
@@ -77,4 +79,4 @@ public function count(): int
     {
         return count($this->items);
     }
-}
+}
diff --git a/src/Server/Client.php b/src/Server/Client.php
@@ -67,4 +67,4 @@ public function disconnect(): void
     {
         $this->connection->close();
     }
-}
+}
diff --git a/src/Server/Logger/Color.php b/src/Server/Logger/Color.php
@@ -4,30 +4,30 @@
 
 final class Color
 {
-    public const RED = "#ff695e";
-    public const RED_INVERTED = "#db2828";
-    public const ORANGE = "#ff851b";
-    public const ORANGE_INVERTED = "#f2711c";
-    public const YELLOW = "#ffe21f";
-    public const YELLOW_INVERTED = "#fbbd08";
-    public const OLIVE = "#d9e778";
-    public const OLIVE_INVERTED = "#b5cc18";
-    public const GREEN = "#2ecc40";
-    public const GREEN_INVERTED = "#21ba45";
-    public const TEAL = "#6dffff";
-    public const TEAL_INVERTED = "#00b5ad";
-    public const BLUE = "#54c8ff";
-    public const BLUE_INVERTED = "#2185d0";
-    public const VIOLET = "#a291fb";
-    public const VIOLET_INVERTED = "#6435c9";
-    public const PURPLE = "#dc73ff";
-    public const PURPLE_INVERTED = "#a333c8";
-    public const PINK = "#ff8edf";
-    public const PINK_INVERTED = "#e03997";
-    public const BROWN = "#d67c1c";
-    public const BROWN_INVERTED = "#a5673f";
-    public const GREY = "#dcddde";
-    public const GREY_INVERTED = "#767676";
-    public const BLACK = "#545454";
-    public const BLACK_INVERTED = "#1b1c1d";
-}
+    public const RED = '#ff695e';
+    public const RED_INVERTED = '#db2828';
+    public const ORANGE = '#ff851b';
+    public const ORANGE_INVERTED = '#f2711c';
+    public const YELLOW = '#ffe21f';
+    public const YELLOW_INVERTED = '#fbbd08';
+    public const OLIVE = '#d9e778';
+    public const OLIVE_INVERTED = '#b5cc18';
+    public const GREEN = '#2ecc40';
+    public const GREEN_INVERTED = '#21ba45';
+    public const TEAL = '#6dffff';
+    public const TEAL_INVERTED = '#00b5ad';
+    public const BLUE = '#54c8ff';
+    public const BLUE_INVERTED = '#2185d0';
+    public const VIOLET = '#a291fb';
+    public const VIOLET_INVERTED = '#6435c9';
+    public const PURPLE = '#dc73ff';
+    public const PURPLE_INVERTED = '#a333c8';
+    public const PINK = '#ff8edf';
+    public const PINK_INVERTED = '#e03997';
+    public const BROWN = '#d67c1c';
+    public const BROWN_INVERTED = '#a5673f';
+    public const GREY = '#dcddde';
+    public const GREY_INVERTED = '#767676';
+    public const BLACK = '#545454';
+    public const BLACK_INVERTED = '#1b1c1d';
+}
diff --git a/src/Server/Logger/Level.php b/src/Server/Logger/Level.php
@@ -2,9 +2,6 @@
 
 namespace CavePHP\Server\Logger;
 
-use CavePHP\Server\Logger\Color;
-use Stringable;
-
 enum Level: string
 {
     case ERROR = Color::RED_INVERTED;
diff --git a/src/Server/Logger/Logger.php b/src/Server/Logger/Logger.php
@@ -15,8 +15,7 @@ public function log(Level $level, Stringable|string $message, array $context = [
             return;
         }
 
-        $makeContextString = static function (array|int $item): string
-        {
+        $makeContextString = static function (array|int $item): string {
             if (is_array($item)) {
                 return json_encode($item);
             }
@@ -30,7 +29,7 @@ public function log(Level $level, Stringable|string $message, array $context = [
             $message .= ' |';
 
             foreach ($context as $item) {
-                $message .= " " . $makeContextString($item);
+                $message .= ' ' . $makeContextString($item);
             }
         }
 
@@ -39,9 +38,9 @@ public function log(Level $level, Stringable|string $message, array $context = [
 
     protected function formatMessage(Level $level, string $message): string
     {
-        $log = "";
+        $log = '';
 
-        $log .= '[' .color($level->value, $level->name) . '] ';
+        $log .= '[' . color($level->value, $level->name) . '] ';
         $log .= '[' . color(Color::BROWN, date('Y-m-d H:i:s')) . ']';
         $log .= " {$message}";
 
@@ -52,16 +51,19 @@ public function error(string $message, array $context = []): void
     {
         $this->log(Level::ERROR, $message, $context);
     }
+
     public function warning(string $message, array $context = []): void
     {
         $this->log(Level::WARNING, $message, $context);
     }
+
     public function info(string $message, array $context = []): void
     {
         $this->log(Level::INFO, $message, $context);
     }
+
     public function debug(string $message, array $context = []): void
     {
         $this->log(Level::DEBUG, $message, $context);
     }
-}
+}
diff --git a/src/Server/Packets/ByteStream.php b/src/Server/Packets/ByteStream.php
@@ -15,12 +15,13 @@ class ByteStream
     public const LONG = 'l';
     public const FLOAT = 'f';
     public const DOUBLE = 'd';
-    private Bytes $data;
 
+    private Bytes $data;
     private int $position = 0;
 
-    public function __construct() {
-        $this->data = new Bytes;
+    public function __construct()
+    {
+        $this->data = new Bytes();
     }
 
     /**
@@ -34,6 +35,7 @@ public function read(int $length = 1): string
 
         $data = $this->data->getRange($this->position, $length);
         $this->move($length);
+
         return $data;
     }
 
@@ -94,7 +96,7 @@ public function readBoolean(): bool
 
     public function readVarInt(): int
     {
-        return (new McVarInt)->read($this);
+        return (new McVarInt())->read($this);
     }
 
     /**
@@ -131,8 +133,9 @@ public function getData(): Bytes
 
     public static function createWithData(string $data): self
     {
-        $stream = new self;
+        $stream = new self();
         $stream->write($data);
+
         return $stream;
     }
-}
+}
diff --git a/src/Server/Packets/Bytes.php b/src/Server/Packets/Bytes.php
@@ -11,7 +11,8 @@ class Bytes implements Countable, Stringable
 {
     private stdClass $data;
 
-    public function __construct() {
+    public function __construct()
+    {
         $this->data = new stdClass();
     }
 
@@ -50,4 +51,4 @@ public function __toString()
     {
         return implode('', get_object_vars($this->data));
     }
-}
+}
diff --git a/src/Server/Packets/GenericPacket.php b/src/Server/Packets/GenericPacket.php
@@ -12,9 +12,8 @@ class GenericPacket
 
     public function __construct(
         public readonly Client $client
-    )
-    {
-        $this->stream = new ByteStream;
+    ) {
+        $this->stream = new ByteStream();
     }
 
     public function getLength(): int
diff --git a/src/Server/Packets/McVars/McChar.php b/src/Server/Packets/McVars/McChar.php
@@ -3,10 +3,8 @@
 namespace CavePHP\Server\Packets\McVars;
 
 use Attribute;
-use CavePHP\Server\Packets\ByteStream;
 
 #[Attribute(Attribute::TARGET_PROPERTY)]
 class McChar
 {
-
-}
+}
diff --git a/src/Server/Packets/McVars/McDouble.php b/src/Server/Packets/McVars/McDouble.php
@@ -7,5 +7,4 @@
 #[Attribute(Attribute::TARGET_PROPERTY)]
 class McDouble
 {
-
-}
+}
diff --git a/src/Server/Packets/McVars/McFloat.php b/src/Server/Packets/McVars/McFloat.php
@@ -7,5 +7,4 @@
 #[Attribute(Attribute::TARGET_PROPERTY)]
 class McFloat
 {
-    
-}
+}
diff --git a/src/Server/Packets/McVars/McInt.php b/src/Server/Packets/McVars/McInt.php
@@ -12,4 +12,4 @@ public function read(ByteStream $stream): int
     {
         return $stream->readInt();
     }
-}
+}
diff --git a/src/Server/Packets/McVars/McIntEnum.php b/src/Server/Packets/McVars/McIntEnum.php
@@ -25,4 +25,4 @@ public function read(ByteStream $stream): BackedEnum
 
         return $this->enum::tryFrom($int);
     }
-}
+}
diff --git a/src/Server/Packets/McVars/McLong.php b/src/Server/Packets/McVars/McLong.php
@@ -7,5 +7,4 @@
 #[Attribute(Attribute::TARGET_PROPERTY)]
 class McLong
 {
-
-}
+}
diff --git a/src/Server/Packets/McVars/McShort.php b/src/Server/Packets/McVars/McShort.php
@@ -7,5 +7,4 @@
 #[Attribute(Attribute::TARGET_PROPERTY)]
 class McShort
 {
-
-}
+}
diff --git a/src/Server/Packets/McVars/McString.php b/src/Server/Packets/McVars/McString.php
@@ -24,4 +24,4 @@ public function read(ByteStream $stream): string
     {
         return $stream->read($this->length);
     }
-}
+}
diff --git a/src/Server/Packets/McVars/McUnsignedChar.php b/src/Server/Packets/McVars/McUnsignedChar.php
@@ -7,5 +7,4 @@
 #[Attribute(Attribute::TARGET_PROPERTY)]
 class McUnsignedChar
 {
-
-}
+}
diff --git a/src/Server/Packets/McVars/McUnsignedShort.php b/src/Server/Packets/McVars/McUnsignedShort.php
@@ -12,4 +12,4 @@ public function read(ByteStream $stream): mixed
     {
         return $stream->readUnsignedShort();
     }
-}
+}
diff --git a/src/Server/Packets/McVars/McVar.php b/src/Server/Packets/McVars/McVar.php
@@ -9,4 +9,4 @@
 interface McVar
 {
     public function read(ByteStream $stream): mixed;
-}
+}
diff --git a/src/Server/Packets/McVars/McVarInt.php b/src/Server/Packets/McVars/McVarInt.php
@@ -12,7 +12,8 @@ class McVarInt implements McVar
     public const SEGMENT_BITS = 0x7F;
     public const CONTINUE_BIT = 0x80;
 
-    public function read(ByteStream $stream): int {
+    public function read(ByteStream $stream): int
+    {
         $value = 0;
         $shift = 0;
 
@@ -22,10 +23,10 @@ public function read(ByteStream $stream): int {
             $shift += 7;
 
             if ($shift >= 32) {
-                throw new CavePHPException("VarInt is too big");
+                throw new CavePHPException('VarInt is too big');
             }
         } while ($byte & self::CONTINUE_BIT);
 
         return $value;
     }
-}
+}
diff --git a/src/Server/Packets/PacketType.php b/src/Server/Packets/PacketType.php
diff --git a/src/Server/Packets/Uniq/UniqPacket.php b/src/Server/Packets/Uniq/UniqPacket.php
diff --git a/src/Server/Server.php b/src/Server/Server.php
diff --git a/src/Utilities/EventEmitter.php b/src/Utilities/EventEmitter.php
diff --git a/src/functions.php b/src/functions.php
diff --git a/tests/LoggerTest.php b/tests/LoggerTest.php

Original file line number	Diff line number	Diff line change
`@@ -5,20 +5,22 @@`
`5`	`5`	`use CavePHP\Exceptions\CavePHPException;`
`6`	`6`	`use Countable;`
`7`	`7`
`8`		`-abstract class Pool implements Countable {`
	`8`	`+abstract class Pool implements Countable`
	`9`	`+{`
`9`	`10`	`private array $items = [];`
`10`	`11`
`11`	`12`	`abstract public function isInstance(object $item): bool;`
`12`	`13`
`13`		`- public function __construct(array $items = []) {`
	`14`	`+ public function __construct(array $items = [])`
	`15`	`+ {`
`14`	`16`	`$this->fill($items);`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`public function fill(array $items): void`
`18`	`20`	`{`
`19`	`21`	`foreach ($items as $item) {`
`20`	`22`	`if (!is_object($item) \|\| !$this->isInstance($item)) {`
`21`		`- throw new CavePHPException("This object is not supported by this collection");`
	`23`	`+ throw new CavePHPException('This object is not supported by this collection');`
`22`	`24`	`}`
`23`	`25`	`}`
`24`	`26`
`@@ -77,4 +79,4 @@ public function count(): int`
`77`	`79`	`{`
`78`	`80`	`return count($this->items);`
`79`	`81`	`}`
`80`		`-}`
	`82`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,4 @@ public function disconnect(): void`
`67`	`67`	`{`
`68`	`68`	`$this->connection->close();`
`69`	`69`	`}`
`70`		`-}`
	`70`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace CavePHP\Server\Logger;`
`4`	`4`
`5`		`-use CavePHP\Server\Logger\Color;`
`6`		`-use Stringable;`
`7`		`-`
`8`	`5`	`enum Level: string`
`9`	`6`	`{`
`10`	`7`	`case ERROR = Color::RED_INVERTED;`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@ public function log(Level $level, Stringable\|string $message, array $context = [`
`15`	`15`	`return;`
`16`	`16`	`}`
`17`	`17`
`18`		`- $makeContextString = static function (array\|int $item): string`
`19`		`- {`
	`18`	`+ $makeContextString = static function (array\|int $item): string {`
`20`	`19`	`if (is_array($item)) {`
`21`	`20`	`return json_encode($item);`
`22`	`21`	`}`
`@@ -30,7 +29,7 @@ public function log(Level $level, Stringable\|string $message, array $context = [`
`30`	`29`	`$message .= ' \|';`
`31`	`30`
`32`	`31`	`foreach ($context as $item) {`
`33`		`- $message .= " " . $makeContextString($item);`
	`32`	`+ $message .= ' ' . $makeContextString($item);`
`34`	`33`	`}`
`35`	`34`	`}`
`36`	`35`
`@@ -39,9 +38,9 @@ public function log(Level $level, Stringable\|string $message, array $context = [`
`39`	`38`
`40`	`39`	`protected function formatMessage(Level $level, string $message): string`
`41`	`40`	`{`
`42`		`- $log = "";`
	`41`	`+ $log = '';`
`43`	`42`
`44`		`- $log .= '[' .color($level->value, $level->name) . '] ';`
	`43`	`+ $log .= '[' . color($level->value, $level->name) . '] ';`
`45`	`44`	`$log .= '[' . color(Color::BROWN, date('Y-m-d H:i:s')) . ']';`
`46`	`45`	`$log .= " {$message}";`
`47`	`46`
`@@ -52,16 +51,19 @@ public function error(string $message, array $context = []): void`
`52`	`51`	`{`
`53`	`52`	`$this->log(Level::ERROR, $message, $context);`
`54`	`53`	`}`
	`54`	`+`
`55`	`55`	`public function warning(string $message, array $context = []): void`
`56`	`56`	`{`
`57`	`57`	`$this->log(Level::WARNING, $message, $context);`
`58`	`58`	`}`
	`59`	`+`
`59`	`60`	`public function info(string $message, array $context = []): void`
`60`	`61`	`{`
`61`	`62`	`$this->log(Level::INFO, $message, $context);`
`62`	`63`	`}`
	`64`	`+`
`63`	`65`	`public function debug(string $message, array $context = []): void`
`64`	`66`	`{`
`65`	`67`	`$this->log(Level::DEBUG, $message, $context);`
`66`	`68`	`}`
`67`		`-}`
	`69`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ class Bytes implements Countable, Stringable`
`11`	`11`	`{`
`12`	`12`	`private stdClass $data;`
`13`	`13`
`14`		`- public function __construct() {`
	`14`	`+ public function __construct()`
	`15`	`+ {`
`15`	`16`	`$this->data = new stdClass();`
`16`	`17`	`}`
`17`	`18`
`@@ -50,4 +51,4 @@ public function __toString()`
`50`	`51`	`{`
`51`	`52`	`return implode('', get_object_vars($this->data));`
`52`	`53`	`}`
`53`		`-}`
	`54`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@`
`7`	`7`	`#[Attribute(Attribute::TARGET_PROPERTY)]`
`8`	`8`	`class McDouble`
`9`	`9`	`{`
`10`		`-`
`11`		`-}`
	`10`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@`
`7`	`7`	`#[Attribute(Attribute::TARGET_PROPERTY)]`
`8`	`8`	`class McFloat`
`9`	`9`	`{`
`10`		`-`
`11`		`-}`
	`10`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@ public function read(ByteStream $stream): int`
`12`	`12`	`{`
`13`	`13`	`return $stream->readInt();`
`14`	`14`	`}`
`15`		`-}`
	`15`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,4 @@ public function read(ByteStream $stream): BackedEnum`
`25`	`25`
`26`	`26`	`return $this->enum::tryFrom($int);`
`27`	`27`	`}`
`28`		`-}`
	`28`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@`
`7`	`7`	`#[Attribute(Attribute::TARGET_PROPERTY)]`
`8`	`8`	`class McLong`
`9`	`9`	`{`
`10`		`-`
`11`		`-}`
	`10`	`+}`