Merge pull request #15 from TheDragonCode/3.x

Changed namespace

Author: Andrey Helldar

.codecov.yml

@@ -1,32 +1,31 @@
-name : phpunit
-on : [ push ]
+name: phpunit
+on: [ push ]
 
-jobs :
-    build :
-        runs-on : ubuntu-latest
+jobs:
+    build:
+        runs-on: ubuntu-latest
 
-        strategy :
-            fail-fast : true
-            matrix :
-                php : [ "7.3", "7.4", "8.0" ]
-                symfony : [ "4.0", "5.0" ]
-                support : [ "2.0", "3.0", "4.0" ]
+        strategy:
+            fail-fast: true
+            matrix:
+                php: [ "7.3", "7.4", "8.0" ]
+                symfony: [ "4.0", "5.0" ]
 
-        name : PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, Support ${{ matrix.support }}
+        name: PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}
 
-        steps :
-            -   name : Checkout code
-                uses : actions/checkout@v2
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v2
 
-            -   name : Setup PHP
-                uses : shivammathur/setup-php@v2
-                with :
-                    php-version : ${{ matrix.php }}
-                    extensions : curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
-                    coverage : none
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php }}
+                    extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
+                    coverage: none
 
-            -   name : Install dependencies
-                run : composer require symfony/finder:^${{ matrix.symfony }} andrey-helldar/support:^${{ matrix.support }}
+            -   name: Install dependencies
+                run: composer require symfony/finder:^${{ matrix.symfony }}
 
-            -   name : Execute tests
-                run : sudo vendor/bin/phpunit
+            -   name: Execute tests
+                run: sudo vendor/bin/phpunit

.editorconfig

@@ -8,9 +8,3 @@ build/
 *.orig
 
 composer.lock
-
-###> symfony/phpunit-bridge ###
-.phpunit
-.phpunit.result.cache
-/phpunit.xml
-###< symfony/phpunit-bridge ###

.github/workflows/coverage.yml

@@ -2,40 +2,41 @@
 
 <img src="https://preview.dragon-code.pro/TheDragonCode/env-sync.svg?brand=php" alt="Environment Synchronization"/>
 
-[![StyleCI Status][badge_styleci]][link_styleci]
-[![Github Workflow Status][badge_build]][link_build]
-[![Coverage Status][badge_coverage]][link_scrutinizer]
-[![Scrutinizer Code Quality][badge_quality]][link_scrutinizer]
-
 [![Stable Version][badge_stable]][link_packagist]
 [![Unstable Version][badge_unstable]][link_packagist]
 [![Total Downloads][badge_downloads]][link_packagist]
+[![Github Workflow Status][badge_build]][link_build]
 [![License][badge_license]][link_license]
 
 
 ## Installation
 
-> If you are using the Laravel framework, then install the [andrey-helldar/env-sync-laravel](https://github.com/andrey-helldar/env-sync-laravel) package instead.
->
-> If you are using the Symfony framework, then install the [andrey-helldar/env-sync-symfony](https://github.com/andrey-helldar/env-sync-symfony) package instead.
+> If you are using the Laravel framework, then install the [dragon-code/env-sync-laravel](https://github.com/TheDragonCode/env-sync-laravel) package instead.
 
 
 To get the latest version of `Environment Synchronization`, simply require the project using [Composer](https://getcomposer.org):
 
 ```bash
-$ composer require andrey-helldar/env-sync --dev
+$ composer require dragon-code/env-sync --dev
 ```
 
 Or manually update `require-dev` block of `composer.json` and run `composer update`.
 
 ```json
 {
     "require-dev": {
-        "andrey-helldar/env-sync": "^2.0"
+        "dragon-code/env-sync": "^3.0"
     }
 }
 ```
 
+### Upgrade from `andrey-helldar/env-sync`
+
+1. In your `composer.json` file, replace "andrey-helldar/env-sync": "^1.0" with "dragon-code/env-sync": "^3.0".
+2. Replace the `Helldar\EnvSync` namespace with `DragonCode\EnvSync` in your app;
+3. Run the command `composer update`.
+4. Profit!
+
 ## How to use
 
 > This package scans files with `*.php`, `*.json`, `*.yml`, `*.yaml` and `*.twig` extensions in the specified folder, receiving from them calls to the `env` and `getenv` functions.
@@ -45,15 +46,14 @@ Or manually update `require-dev` block of `composer.json` and run `composer upda
 
 ### Frameworks
 
-* Laravel / Lumen Frameworks - See the documentation in [this repository](https://github.com/andrey-helldar/env-sync-laravel).
-* Symfony Framework - See the documentation in [this repository](https://github.com/andrey-helldar/env-sync-symfony).
+* Laravel / Lumen Frameworks - See the documentation in [this repository](https://github.com/TheDragonCode/env-sync-laravel).
 
 ### Native using
 
 To call a command in your application, you need to do the following:
 
 ```php
-use Helldar\EnvSync\Services\Syncer;
+use DragonCode\EnvSync\Services\Syncer;
 
 protected function syncer(): Syncer
 {
@@ -72,7 +72,7 @@ protected function sync()
 If you want to define default values or specify which key values should be stored, you need to pass an array to the constructor of the `Config` class:
 
 ```php
-use Helldar\EnvSync\Services\Syncer;
+use DragonCode\EnvSync\Services\Syncer;
 
 protected function syncer(): Syncer
 {
@@ -93,28 +93,18 @@ You can also suggest your implementation by sending a PR. We will be glad 😊
 This package is licensed under the [MIT License](LICENSE).
 
 
-[badge_build]:          https://img.shields.io/github/workflow/status/andrey-helldar/env-sync/phpunit?style=flat-square
+[badge_build]:          https://img.shields.io/github/workflow/status/TheDragonCode/env-sync/phpunit?style=flat-square
 
-[badge_downloads]:      https://img.shields.io/packagist/dt/andrey-helldar/env-sync.svg?style=flat-square
+[badge_downloads]:      https://img.shields.io/packagist/dt/dragon-code/env-sync.svg?style=flat-square
 
-[badge_license]:        https://img.shields.io/packagist/l/andrey-helldar/env-sync.svg?style=flat-square
+[badge_license]:        https://img.shields.io/packagist/l/dragon-code/env-sync.svg?style=flat-square
 
-[badge_coverage]:       https://img.shields.io/scrutinizer/coverage/g/andrey-helldar/env-sync.svg?style=flat-square
-
-[badge_quality]:        https://img.shields.io/scrutinizer/g/andrey-helldar/env-sync.svg?style=flat-square
-
-[badge_stable]:         https://img.shields.io/github/v/release/andrey-helldar/env-sync?label=stable&style=flat-square
-
-[badge_styleci]:        https://styleci.io/repos/333111450/shield
+[badge_stable]:         https://img.shields.io/github/v/release/TheDragonCode/env-sync?label=stable&style=flat-square
 
 [badge_unstable]:       https://img.shields.io/badge/unstable-dev--main-orange?style=flat-square
 
-[link_build]:           https://github.com/andrey-helldar/env-sync/actions
+[link_build]:           https://github.com/TheDragonCode/env-sync/actions
 
 [link_license]:         LICENSE
 
-[link_packagist]:       https://packagist.org/packages/andrey-helldar/env-sync
-
-[link_scrutinizer]:     https://scrutinizer-ci.com/g/andrey-helldar/env-sync/?branch=main
-
-[link_styleci]:         https://github.styleci.io/repos/333111450
+[link_packagist]:       https://packagist.org/packages/dragon-code/env-sync

.github/workflows/phpunit.yml

@@ -1,35 +1,34 @@
 {
-    "name": "andrey-helldar/env-sync",
+    "name": "dragon-code/env-sync",
     "description": "Keeping your .env.example is up to date",
     "type": "library",
     "license": "MIT",
-    "keywords": ["env", "dotenv", "environment", "sync", "laravel", "symfony", "yii", "yii2", "framework", "native"],
+    "keywords": ["env", "dotenv", "environment", "sync", "laravel", "symfony", "yii", "yii2", "framework", "native", "dragon-code", "dragon", "andrey-helldar"],
     "authors": [
         {
             "name": "Andrey Helldar",
             "email": "[email protected]"
         }
     ],
     "support": {
-        "issues": "https://github.com/andrey-helldar/env-sync/issues",
-        "source": "https://github.com/andrey-helldar/env-sync"
+        "issues": "https://github.com/TheDragonCode/env-sync/issues",
+        "source": "https://github.com/TheDragonCode/env-sync"
     },
     "require": {
         "php": "^7.3|^8.0",
-        "andrey-helldar/support": "^2.5|^3.0|^4.0",
+        "dragon-code/support": "^5.0",
         "symfony/finder": "^4.0|^5.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.1",
-        "phpunit/phpunit": "^8.0|^9.0"
+        "phpunit/phpunit": "^9.0"
     },
     "suggest": {
-        "andrey-helldar/env-sync-laravel": "env-sync package adapter for Laravel framework",
-        "andrey-helldar/env-sync-symfony": "env-sync package adapter for Symfony framework"
+        "dragon-code/env-sync-laravel": "env-sync package adapter for Laravel framework"
     },
     "autoload": {
         "psr-4": {
-            "Helldar\\EnvSync\\": "src"
+            "DragonCode\\EnvSync\\": "src"
         }
     },
     "autoload-dev": {
@@ -42,13 +41,5 @@
         "sort-packages": true
     },
     "minimum-stability": "stable",
-    "prefer-stable": true,
-    "extra": {
-        "thanks": [
-            {
-                "name": "andrey-helldar/support",
-                "url": "https://github.com/andrey-helldar/support"
-            }
-        ]
-    }
+    "prefer-stable": true
 }

.gitignore

@@ -1,13 +1,13 @@
 <?php
 
-namespace Helldar\EnvSync\Concerns;
-
-use Helldar\EnvSync\Services\Compiler;
-use Helldar\EnvSync\Services\Finder;
-use Helldar\EnvSync\Services\Parser;
-use Helldar\EnvSync\Services\Stringify;
-use Helldar\EnvSync\Services\Syncer;
-use Helldar\EnvSync\Support\Config;
+namespace DragonCode\EnvSync\Concerns;
+
+use DragonCode\EnvSync\Services\Compiler;
+use DragonCode\EnvSync\Services\Finder;
+use DragonCode\EnvSync\Services\Parser;
+use DragonCode\EnvSync\Services\Stringify;
+use DragonCode\EnvSync\Services\Syncer;
+use DragonCode\EnvSync\Support\Config;
 use Symfony\Component\Finder\Finder as SymfonyFinder;
 
 trait Makeable

README.md

@@ -1,19 +1,22 @@
 <?php
 
-namespace Helldar\EnvSync\Services;
+namespace DragonCode\EnvSync\Services;
 
-use Helldar\EnvSync\Support\Config;
-use Helldar\Support\Concerns\Makeable;
-use Helldar\Support\Facades\Helpers\Instance;
-use Helldar\Support\Facades\Helpers\Str;
+use DragonCode\EnvSync\Support\Config;
+use DragonCode\Support\Concerns\Makeable;
+use DragonCode\Support\Facades\Helpers\Instance;
+use DragonCode\Support\Facades\Helpers\OS;
+use DragonCode\Support\Facades\Helpers\Str;
 
-final class Compiler
+class Compiler
 {
     use Makeable;
 
     protected $hides = ['CLIENT', 'HOOK', 'KEY', 'LOGIN', 'PASS', 'SECRET', 'TOKEN', 'USER'];
 
-    protected $separator = "\n";
+    protected $unix_separator = "\n";
+
+    protected $windows_separator = "\r\n";
 
     protected $stringify;
 
@@ -43,7 +46,7 @@ public function get(): string
     }
 
     /**
-     * @param  array|\Helldar\EnvSync\Support\Config  $config
+     * @param  array|\DragonCode\EnvSync\Support\Config  $config
      *
      * @return $this
      */
@@ -80,15 +83,17 @@ protected function compile(): string
     {
         $result = '';
 
+        $separator = $this->getSeparator();
+
         foreach ($this->items as $values) {
             foreach ($values as $key => $value) {
-                $result .= "{$key}={$value}{$this->separator}";
+                $result .= "{$key}={$value}{$separator}";
             }
 
-            $result .= $this->separator;
+            $result .= $separator;
         }
 
-        return trim($result) . $this->separator;
+        return trim($result) . $separator;
     }
 
     protected function replace(string $key, $value)
@@ -126,4 +131,11 @@ protected function section(string $key): string
     {
         return Str::before($key, '_');
     }
+
+    protected function getSeparator(): string
+    {
+        return OS::isWindows()
+            ? $this->windows_separator
+            : $this->unix_separator;
+    }
 }