small fixes for the release of v4 (#479)

ildyria · d7415 · web-flow · commit 1d70bdcf50dc · 2020-04-18T02:44:04.000+02:00
* small fixes for the release of v4
* correct urls
* Update readme URLs
* Add link to changelog for v3 users
* improving the install procedure, fixing the removing procedure

Co-authored-by: Martin Stone &lt;martin@d7415.co.uk&gt;
diff --git a/.env.example b/.env.example
@@ -12,7 +12,6 @@ DB_PORT=3306
 DB_DATABASE=homestead
 DB_USERNAME=homestead
 DB_PASSWORD=secret
-DB_DROP_CLEAR_TABLES_ON_ROLLBACK=true
 DB_LOG_SQL=false
 
 # leave empty or delete the line for default (empty string).
diff --git a/.env.mariadb.travis b/.env.mariadb.travis
@@ -7,7 +7,6 @@ DB_PORT=3306
 DB_DATABASE=homestead_test
 DB_USERNAME=root
 DB_PASSWORD=
-DB_DROP_CLEAR_TABLES_ON_ROLLBACK=true
 
 CACHE_DRIVER=array
 SESSION_DRIVER=array
diff --git a/.env.postgresql.travis b/.env.postgresql.travis
@@ -7,7 +7,6 @@ DB_PORT=5432
 DB_DATABASE=homestead_test
 DB_USERNAME=postgres
 DB_PASSWORD=
-DB_DROP_CLEAR_TABLES_ON_ROLLBACK=true
 
 CACHE_DRIVER=array
 SESSION_DRIVER=array
diff --git a/app/ControllerFunctions/Install/RequirementsChecker.php b/app/ControllerFunctions/Install/RequirementsChecker.php
@@ -65,7 +65,7 @@ public function check(array $requirements)
 
 				// @codeCoverageIgnoreStart
 				default:
-				break;
+					break;
 				// @codeCoverageIgnoreEnd
 			}
 		}
diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
@@ -194,7 +194,6 @@ public function server(Request $request)
 					$this->memLimit *= 1024 * 1024 * 1024 * 1024;
 					break;
 				default:
-					$this->memLimit *= 1;
 					break;
 				// @codeCoverageIgnoreEnd
 			}
diff --git a/config/urls.php b/config/urls.php
@@ -3,10 +3,10 @@
 return [
 	'update' => [
 		// we need this in case the URL of the project changes
-		'git' => 'http://api.github.com/repos/LycheeOrg/Lychee-Laravel/commits',
+		'git' => 'http://api.github.com/repos/LycheeOrg/Lychee/commits',
 		'json' => 'https://lycheeorg.github.io/update.json',
 	],
 	'git' => [
-		'pull' => 'https://github.com/LycheeOrg/Lychee-Laravel.git',
+		'pull' => 'https://github.com/LycheeOrg/Lychee.git',
 	],
 ];
diff --git a/database/migrations/2018_08_15_102039_move_albums.php b/database/migrations/2018_08_15_102039_move_albums.php
@@ -48,7 +48,9 @@ public function up()
 	public function down()
 	{
 		if (Schema::hasTable('lychee_albums')) {
+			Schema::disableForeignKeyConstraints();
 			Album::truncate();
+			Schema::enableForeignKeyConstraints();
 		}
 	}
 }
diff --git a/database/migrations/2018_08_15_103716_move_photos.php b/database/migrations/2018_08_15_103716_move_photos.php
@@ -2,6 +2,7 @@
 
 use App\Album;
 use App\Logs;
+use App\ModelFunctions\Helpers;
 use App\Photo;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\DB;
@@ -33,6 +34,7 @@ public function up()
 						$album = $album_id;
 					}
 					$photo->id = $id;
+					$photo->album_id = $album;
 					$photo->title = $result->title;
 					$photo->description = $result->description;
 					$photo->url = $result->url;
@@ -63,8 +65,6 @@ public function up()
 							$photo->thumb2x = 1;
 						}
 					}
-
-					$photo->album_id = $album;
 					$photo->checksum = $result->checksum;
 					if (Storage::exists('medium/' . $photo->url)) {
 						list($width, $height) = getimagesize(Storage::path('medium/' . $photo->url));
diff --git a/public/installer/assets/css/style.css b/public/installer/assets/css/style.css
diff --git a/readme.md b/readme.md
@@ -1,16 +1,22 @@
-<p align="center"><img src="https://raw.githubusercontent.com/LycheeOrg/Lychee-Laravel/master/Banner.png" width="400px" alt="@LycheeOrg"></p>
+<p align="center"><img src="https://raw.githubusercontent.com/LycheeOrg/Lychee/master/Banner.png" width="400px" alt="@LycheeOrg"></p>
 
 <p align="center">
-<a href="https://travis-ci.com/LycheeOrg/Lychee-Laravel"><img src="https://travis-ci.com/LycheeOrg/Lychee-Laravel.svg?branch=master" alt="Build Status"></a>
-<a href="https://codecov.io/gh/LycheeOrg/Lychee-Laravel"><img src="https://codecov.io/gh/LycheeOrg/Lychee-Laravel/branch/master/graph/badge.svg" alt="Code Coverage"></a>
-<a href="https://github.com/LycheeOrg/Lychee-Laravel/releases"><img alt="GitHub release" src="https://img.shields.io/github/release-pre/LycheeOrg/Lychee-Laravel.svg"></a>
-<a href="https://github.com/LycheeOrg/Lychee-Laravel/blob/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/LycheeOrg/Lychee-Laravel.svg"></a>
+<a href="https://travis-ci.com/LycheeOrg/Lychee"><img src="https://travis-ci.com/LycheeOrg/Lychee.svg?branch=master" alt="Build Status"></a>
+<a href="https://codecov.io/gh/LycheeOrg/Lychee"><img src="https://codecov.io/gh/LycheeOrg/Lychee/branch/master/graph/badge.svg" alt="Code Coverage"></a>
+<a href="https://github.com/LycheeOrg/Lychee/releases"><img alt="GitHub release" src="https://img.shields.io/github/release-pre/LycheeOrg/Lychee.svg"></a>
+<a href="https://github.com/LycheeOrg/Lychee/blob/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/LycheeOrg/Lychee.svg"></a>
 <a href="https://gitter.im/LycheeOrg/Lobby"><img src="https://img.shields.io/gitter/room/LycheeOrg/Lobby.svg?logo=gitter" alt="Gitter"></a>
 <a href="https://bestpractices.coreinfrastructure.org/projects/2855"><img alt="CII Best Practices Summary" src="https://img.shields.io/cii/summary/2855.svg"></a>
-<a href="https://sonarcloud.io/dashboard?id=LycheeOrg_Lychee-Laravel"><img alt="Quality Gate Status" src="https://sonarcloud.io/api/project_badges/measure?project=LycheeOrg_Lychee-Laravel&metric=alert_status"></a>
+<a href="https://sonarcloud.io/dashboard?id=LycheeOrg_Lychee"><img alt="Quality Gate Status" src="https://sonarcloud.io/api/project_badges/measure?project=LycheeOrg_Lychee&metric=alert_status"></a>
 </p>
 
 
+#### Help, I'm lost!
+
+I was using the version 3, how do I upgrade to version 4? See [Upgrade &#187;](https://github.com/LycheeOrg/Lychee/wiki/Upgrade-from-version-3)
+
+To find out what's changed, see the [changelog &#187;](https://github.com/LycheeOrg/Lychee/wiki/Changelog)
+
 #### A great looking and easy-to-use photo-management-system.
 
 *Since the 1st of April 2018 this project has moved to it's own Organisation (https://github.com/LycheeOrg) where people are able to submit their fixes to it. We, the Organisation owners, want to thank electerious (Tobias Reich) for the opportunity to make this project live on.*
@@ -24,50 +30,50 @@ Lychee is a free photo-management tool, which runs on your server or web-space.
 
 To run Lychee, everything you need is a web-server with PHP 7.3 or later and a MySQL-Database. Follow the instructions to install Lychee on your server. This version of Lychee is built on the Laravel framework. To install:
 
-1. Clone this repo to your server and set the web root to `lychee-laravel/public`
+1. Clone this repo to your server and set the web root to `lychee/public`
 2. Run `composer install --no-dev` to install dependencies
 3. Copy `.env.example` as `.env` and edit it to match your parameters
 4. Generate your secret key with `php artisan key:generate`
-5. Migrate your database with `php artisan migrate` to create a new database or migrate an existing Lychee installation to the new framework.
+5. Migrate your database with `php artisan migrate` to create a new database or migrate an existing Lychee installation to the latest framework.
 
-See detailed instructions on the [Installation](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Install) wiki page.
+See detailed instructions on the [Installation](https://github.com/LycheeOrg/Lychee/wiki/Install) wiki page.
 
 ### Docker
 
 Alternatively, an official Docker image can be found at [LycheeOrg/Lychee-Laravel-Docker](https://github.com/LycheeOrg/Lychee-Laravel-Docker) or on Docker Hub as [lycheeorg/lychee-laravel](https://hub.docker.com/r/lycheeorg/lychee-laravel).
 
 ### Update
 
-Updating is as easy as it should be.  [Update &#187;](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Update)
+Updating is as easy as it should be.  [Update &#187;](https://github.com/LycheeOrg/Lychee/wiki/Update)
 
 ### Settings
 
-Sign in and click the gear in the top left corner to change your settings. [Settings &#187;](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Settings)
+Sign in and click the gear in the top left corner to change your settings. [Settings &#187;](https://github.com/LycheeOrg/Lychee/wiki/Settings)
 
 ### Build
 
-Lychee is ready to use, right out of the box. If you want to contribute and edit CSS or JS files, you need to rebuild [Lychee-front](https://github.com/LycheeOrg/Lychee-front). [Build &#187;](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Build)
+Lychee is ready to use, right out of the box. If you want to contribute and edit CSS or JS files, you need to rebuild [Lychee-front](https://github.com/LycheeOrg/Lychee-front). [Build &#187;](https://github.com/LycheeOrg/Lychee/wiki/Build)
 
 ## Advanced Features
 
 Lychee is ready to use straight after installation, but some features require a little more configuration.
 
 ### Keyboard Shortcuts
 
-These shortcuts will help you to use Lychee even faster. [Keyboard Shortcuts &#187;](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Keyboard-Shortcuts)
+These shortcuts will help you to use Lychee even faster. [Keyboard Shortcuts &#187;](https://github.com/LycheeOrg/Lychee/wiki/Keyboard-Shortcuts)
 
 ### Dropbox import
 
-In order to use the Dropbox import from your server, you need a valid drop-ins app key from [their website](https://www.dropbox.com/developers/apps/create). Lychee will ask you for this key, the first time you try to use the import. Want to change your code? Take a look at [the settings](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Settings) of Lychee.
+In order to use the Dropbox import from your server, you need a valid drop-ins app key from [their website](https://www.dropbox.com/developers/apps/create). Lychee will ask you for this key, the first time you try to use the import. Want to change your code? Take a look at [the settings](https://github.com/LycheeOrg/Lychee/wiki/Settings) of Lychee.
 
 ### Twitter Cards
 
 Lychee supports [Twitter Cards](https://dev.twitter.com/docs/cards) and [Open Graph](http://opengraphprotocol.org) for shared images (not albums). In order to use Twitter Cards you need to request an approval for your domain. Simply share an image with Lychee, copy its link and paste it in [Twitters Card Validator](https://dev.twitter.com/docs/cards/validation/validator).
 
 ### Imagick
 
-Lychee uses [Imagick](https://www.imagemagick.org) when installed on your server. In this case you will benefit from a faster processing of your uploads, better looking thumbnails and intermediate sized images for small screen devices. You can disable the usage of [Imagick](https://www.imagemagick.org) in the [settings](https://github.com/LycheeOrg/Lychee-Laravel/wiki/Settings).
+Lychee uses [Imagick](https://www.imagemagick.org) when installed on your server. In this case you will benefit from a faster processing of your uploads, better looking thumbnails and intermediate sized images for small screen devices. You can disable the usage of [Imagick](https://www.imagemagick.org) in the [settings](https://github.com/LycheeOrg/Lychee/wiki/Settings).
 
 ## Troubleshooting
 
-Take a look at the [Wiki](https://github.com/LycheeOrg/Lychee-Laravel/wiki/), particularly the [FAQ](https://github.com/LycheeOrg/Lychee-Laravel/wiki/FAQ) if you have problems. Discovered a bug? Please create an issue [here](https://github.com/LycheeOrg/Lychee-Laravel/issues) on GitHub!
+Take a look at the [Wiki](https://github.com/LycheeOrg/Lychee/wiki/), particularly the [FAQ](https://github.com/LycheeOrg/Lychee/wiki/FAQ) if you have problems. Discovered a bug? Please create an issue [here](https://github.com/LycheeOrg/Lychee/issues) on GitHub!
diff --git a/resources/views/install/env.blade.php b/resources/views/install/env.blade.php
@@ -8,9 +8,11 @@
 <ul class="list">
     <li class="list__item list__item--env list__title error"><span><i class="fa fa-ban" aria-hidden="true"></i> <strong>Lychee does not create the database.</strong></span></li>
     <li class="list__item list__item--env">1 - Manually create your database and then enter the sql details bellow.</li>
-    <li class="list__item list__item--env">2 - Edit the form below to reflect your desired configuration.</li>
-    </ul>
-    <strong>For more details of how those values are used, look in the "config" folder.</strong><br/>
+    <li class="list__item list__item--env">2 - If you are migrating from the v3, copy your pictures from <br>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<code class="folder">version3/uploads/</code> to <code class="folder">version4/public/uploads/</code>.</li>
+    <li class="list__item list__item--env">3 - Edit the form below to reflect your desired configuration.</li>
+</ul>
+<strong>For more details of how those values are used, look in the "config" folder.</strong><br/>
     <form method="post" action="{{ route('install-env') }}">
         <textarea class="textarea" name="envConfig">{{ $env }}</textarea>
         <div class="buttons buttons--right">

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function check(array $requirements)`
`65`	`65`
`66`	`66`	`// @codeCoverageIgnoreStart`
`67`	`67`	`default:`
`68`		`- break;`
	`68`	`+ break;`
`69`	`69`	`// @codeCoverageIgnoreEnd`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,6 @@ public function server(Request $request)`
`194`	`194`	`$this->memLimit = 1024 1024 * 1024 * 1024;`
`195`	`195`	`break;`
`196`	`196`	`default:`
`197`		`- $this->memLimit *= 1;`
`198`	`197`	`break;`
`199`	`198`	`// @codeCoverageIgnoreEnd`
`200`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ public function up()`
`48`	`48`	`public function down()`
`49`	`49`	`{`
`50`	`50`	`if (Schema::hasTable('lychee_albums')) {`
	`51`	`+ Schema::disableForeignKeyConstraints();`
`51`	`52`	`Album::truncate();`
	`53`	`+ Schema::enableForeignKeyConstraints();`
`52`	`54`	`}`
`53`	`55`	`}`
`54`	`56`	`}`