From 9f9528b3d0e65971e2bcccdd8371295547323a53 Mon Sep 17 00:00:00 2001
From: Sujip Thapa <sudiptpa@gmail.com>
Date: Sat, 8 Aug 2020 16:18:19 +0545
Subject: [PATCH 1/2] Added fix for composer 2.0

---
 composer.json                                | 89 +++++++++++---------
 src/{Sujip/Guid => }/Facades/Guid.php        |  0
 src/{Sujip/Guid => }/Guid.php                |  0
 src/{Sujip/Guid => }/GuidServiceProvider.php |  0
 src/{Sujip/Guid => }/helpers.php             |  0
 5 files changed, 49 insertions(+), 40 deletions(-)
 rename src/{Sujip/Guid => }/Facades/Guid.php (100%)
 rename src/{Sujip/Guid => }/Guid.php (100%)
 rename src/{Sujip/Guid => }/GuidServiceProvider.php (100%)
 rename src/{Sujip/Guid => }/helpers.php (100%)

diff --git a/composer.json b/composer.json
index 39bfe9d..8cb5577 100644
--- a/composer.json
+++ b/composer.json
@@ -1,43 +1,52 @@
 {
-   "name": "sudiptpa/guid",
-   "description": "A Simple GUID generator Package for PHP.",
-   "license": "MIT",
-   "type": "library",
-   "keywords": [
-      "guid"
-   ],
-   "authors": [
-      {
-         "name": "Sujip Thapa",
-         "email": "sudiptpa@gmail.com",
-         "homepage": "https://sujipthapa.co",
-         "role": "Senior Developer"
-      }
-   ],
-   "require": {
-      "php": ">=5.4.0"
-   },
-   "require-dev": {
-      "friendsofphp/php-cs-fixer": "~1.0"
-   },
-   "autoload": {
-      "psr-4": {
-         "Sujip\\Guid\\": "src/"
-      }
-   },
-   "minimum-stability": "dev",
-   "prefer-stable": true,
-   "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        },
-        "laravel": {
-            "providers": [
-                "Sujip\\Guid\\GuidServiceProvider"
-            ],
-            "aliases": {
-                "Guid": "Sujip\\Guid\\Facades\\Guid"
-            }
-        }
+  "name": "sudiptpa/guid",
+  "type": "library",
+  "description": "A Simple GUID generator Package for PHP.",
+  "homepage": "https://github.com/sudiptpa/guid",
+  "keywords": [
+    "guid"
+  ],
+  "license": "MIT",
+  "authors": [
+    {
+      "email": "sudiptpa@gmail.com",
+      "homepage": "https://sujipthapa.co",
+      "name": "Sujip Thapa",
+      "role": "Web Developer"
     }
+  ],
+  "autoload": {
+    "files": [
+      "src/helpers.php"
+    ],
+    "psr-4": {
+      "Sujip\\Guid\\": "src/"
+    }
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "1.0.x-dev"
+    },
+    "laravel": {
+      "aliases": {
+        "Guid": "Sujip\\Guid\\Facades\\Guid"
+      },
+      "providers": [
+        "Sujip\\Guid\\GuidServiceProvider"
+      ]
+    }
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+  "require": {
+    "php": ">=5.4.0"
+  },
+  "require-dev": {
+    "friendsofphp/php-cs-fixer": "~1.0"
+  },
+  "support": {
+    "issues": "https://github.com/sudiptpa/guid/issues",
+    "rss": "https://github.com/sudiptpa/guid/releases.atom",
+    "source": "https://github.com/sudiptpa/guid"
+  }
 }
diff --git a/src/Sujip/Guid/Facades/Guid.php b/src/Facades/Guid.php
similarity index 100%
rename from src/Sujip/Guid/Facades/Guid.php
rename to src/Facades/Guid.php
diff --git a/src/Sujip/Guid/Guid.php b/src/Guid.php
similarity index 100%
rename from src/Sujip/Guid/Guid.php
rename to src/Guid.php
diff --git a/src/Sujip/Guid/GuidServiceProvider.php b/src/GuidServiceProvider.php
similarity index 100%
rename from src/Sujip/Guid/GuidServiceProvider.php
rename to src/GuidServiceProvider.php
diff --git a/src/Sujip/Guid/helpers.php b/src/helpers.php
similarity index 100%
rename from src/Sujip/Guid/helpers.php
rename to src/helpers.php

From 90819bed02d0ab1fc97789c18bd26fba3174458d Mon Sep 17 00:00:00 2001
From: Sujip Thapa <sudiptpa@users.noreply.github.com>
Date: Sat, 8 Aug 2020 10:35:59 +0000
Subject: [PATCH 2/2] Apply fixes from StyleCI

---
 src/Guid.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Guid.php b/src/Guid.php
index 40370d0..cea6d24 100644
--- a/src/Guid.php
+++ b/src/Guid.php
@@ -36,6 +36,7 @@ public function create($trim = true)
             $data = openssl_random_pseudo_bytes(16);
             $data[6] = chr(ord($data[6]) & 0x0f | 0x40); // set version to 0100
             $data[8] = chr(ord($data[8]) & 0x3f | 0x80); // set bits 6-7 to 10
+
             return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
         }