Append a newline to the buffer if not present

[ashokadewit]

When a file was loaded that did not end with a newline a new variable
would be written on the same line as the last variable.

[sergejostir]

This will not work properly on Windows.
Fix: https://github.com/sergiz/laravel-dotenv-editor/commit/b5685b94068a48d59b15356bf8661153f17d2195

[JackieDo]

This will not work properly on Windows.
Fix: sergiz@b5685b9

@sergiz : I think the following is the best solution:

...
use Illuminate\Support\Str;
...

    /**
     * Set buffer with content
     *
     * @param  string $content
     *
     * @return DotenvWriter
     */
    public function setBuffer($content)
    {
        if (!empty($content) && !Str::endsWith($content, PHP_EOL)) {
            $content .= PHP_EOL;
        }

        $this->buffer = $content;

        return $this;
    }

How do you think?

[sergejostir]

What's wrong with the current solution that you implemented?

Laravel-Dotenv-Editor/src/Jackiedo/DotenvEditor/DotenvWriter.php

Line 63 in 82aaec9

$this->buffer = trim($content) . PHP_EOL;

[JackieDo]

What's wrong with the current solution that you implemented?

Laravel-Dotenv-Editor/src/Jackiedo/DotenvEditor/DotenvWriter.php

Line 63 in 82aaec9

$this->buffer = trim($content) . PHP_EOL;

@sergiz : This solution I have implemented before your solution. But now realize that your solution is more complete.

[JackieDo]

@sergiz : However, I would like to change your solution a bit to prevent adding new lines when the .env file is empty.

[sergejostir]

I see. Well, the whole point here is to not use PHP_EOL constant, but '\n' when doing the check. This is why the initial PR is broken.

On windows PHP_EOL will be \r\n, so the check will fail, if the $content ends with just '\n'.

That's why I also kinda like your solution with trim because it will get rid of practically all useless characters. However I would propose using rtrim since someone might like to have an empty line at the beginning.

        if (!empty($content)) {
            $content = rtrim($content) . PHP_EOL;
        }

[JackieDo]

@sergiz : Now we have two request:

• Request 1: Prevent adding lines if the .env file is empty
• Request 2: Use PHP_EOL instead of "\n"

What request do you agree with? (none, 1, 2 or both of all)

[sergejostir]

What do you mean?

        if (!empty($content)) {
            $content = rtrim($content) . PHP_EOL;
        }

Fits all. It doesn't add new line when the file is empty, and it makes sure that the content ends with a new line on all platforms.

[JackieDo]

What do you mean?

        if (!empty($content)) {
            $content = rtrim($content) . PHP_EOL;
        }

Fits all. It doesn't add new line when the file is empty, and it makes sure that the content ends with a new line on all platforms.

@sergiz : Yeah, this is the best solution.

[JackieDo]

@sergiz : This issue has been resolved. See f54431c.