Merge pull request #645 from humanmade/remove-manual-install

Remove manual install

README.md

@@ -37,7 +37,7 @@ It's focused on providing a highly robust S3 interface with no "bells and whistl
 
 ## Getting Set Up
 
-### Install Using Composer
+S3 Uploads requires installation via Composer:
 
 ```
 composer require humanmade/s3-uploads
@@ -49,13 +49,7 @@ composer require humanmade/s3-uploads
 require_once __DIR__ . '/vendor/autoload.php';
 ```
 
-### Install Manually
-
-If you do not use Composer to manage plugins or other dependencies, you can install the plugin manually. Download the `manual-install.zip` file from the [Releases page](https://github.com/humanmade/S3-Uploads/releases) and extract the ZIP file to your `plugins` directory.
-
-You can also `git clone` this repository, and run `composer install` in the plugin folder to pull in its dependencies.
-
----
+## Configuration
 
 Once you've installed the plugin, add the following constants to your `wp-config.php`:
 

composer.json

@@ -11,9 +11,8 @@
 	},
 	"authors": [
 		{
-			"name":"Human Made Limited",
-			"email":"[email protected]",
-			"homepage":"http://hmn.md/"
+			"name": "Human Made",
+			"homepage": "https://humanmade.com/"
 		}
 	],
 	"support": {

inc/namespace.php

@@ -5,8 +5,8 @@
 function init() {
 	// Ensure the AWS SDK can be loaded.
 	if ( ! class_exists( '\\Aws\\S3\\S3Client' ) ) {
-		// Require AWS Autoloader file.
-		require_once dirname( __DIR__ ) . '/vendor/autoload.php';
+		trigger_error( 'S3 Uploads requires the AWS SDK. Ensure Composer dependencies have been loaded.', E_USER_WARNING );
+		return;
 	}
 
 	if ( ! check_requirements() ) {

tests/bootstrap.php

@@ -9,7 +9,10 @@
 require '/wp-phpunit/includes/functions.php';
 
 function _manually_load_plugin() {
-	require dirname( __FILE__ ) . '/../s3-uploads.php';
+	if ( file_exists( dirname( __DIR__ ) . '/vendor/autoload.php' ) ) {
+		require dirname( __DIR__ ) . '/vendor/autoload.php';
+	}
+	require dirname( __DIR__ ) . '/s3-uploads.php';
 }
 tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );