Added composer for autoloader and moved files to conform to PSR-0

lib/WPStrava.php

@@ -1,13 +1,5 @@
 <?php
 
-require_once WPSTRAVA_PLUGIN_DIR . 'lib/Settings.class.php';
-require_once WPSTRAVA_PLUGIN_DIR . 'lib/SOM.class.php';
-require_once WPSTRAVA_PLUGIN_DIR . 'lib/Activity.class.php';
-require_once WPSTRAVA_PLUGIN_DIR . 'lib/LatestActivitiesShortcode.class.php';
-require_once WPSTRAVA_PLUGIN_DIR . 'lib/ActivityShortcode.class.php';
-require_once WPSTRAVA_PLUGIN_DIR . 'lib/RouteShortcode.class.php';
-require_once WPSTRAVA_PLUGIN_DIR . 'lib/StaticMap.class.php';
-
 class WPStrava {
 
 	private static $instance = null;
@@ -60,7 +52,6 @@ class WPStrava {
 		}
 
 		if ( empty( $this->api[ $token ] ) ) {
-			require_once WPSTRAVA_PLUGIN_DIR . 'lib/API.class.php';
 			$this->api[ $token ] = new WPStrava_API( $token );
 		}
 
@@ -77,7 +68,6 @@ class WPStrava {
 
 	public function get_routes() {
 		if ( ! $this->routes ) {
-			require_once WPSTRAVA_PLUGIN_DIR . 'lib/Routes.class.php';
 			$this->routes = new WPStrava_Routes();
 		}
 		return $this->routes;
@@ -89,8 +79,6 @@ class WPStrava {
 	}
 
 	public function register_widgets() {
-		require_once WPSTRAVA_PLUGIN_DIR . 'lib/LatestActivitiesWidget.class.php';
-		require_once WPSTRAVA_PLUGIN_DIR . 'lib/LatestMapWidget.class.php';
 		register_widget( 'WPStrava_LatestActivitiesWidget' );
 		register_widget( 'WPStrava_LatestMapWidget' );
 	}

lib/WPStrava/LatestActivities.php

@@ -1,6 +1,6 @@
 <?php
 
-class WPStava_LatestActivities {
+class WPStrava_LatestActivities {
 	public static function get_activities_html( $args ) {
 
 		$defaults = array(

lib/WPStrava/LatestActivitiesShortcode.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once WPSTRAVA_PLUGIN_DIR . 'lib/LatestActivities.class.php';
-
 class WPStrava_LatestActivitiesShortcode {
 	private static $add_script;
 
@@ -14,7 +12,7 @@ class WPStrava_LatestActivitiesShortcode {
 	// [activities som=metric quantity=5 athlete_token=xxx|strava_club_id=yyy]
 	public static function handler( $atts ) {
 		self::$add_script = true;
-		return WPStava_LatestActivities::get_activities_html( $atts );
+		return WPStrava_LatestActivities::get_activities_html( $atts );
 	} // handler
 
 	public static function print_scripts() {

lib/WPStrava/LatestActivitiesWidget.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once WPSTRAVA_PLUGIN_DIR . 'lib/LatestActivities.class.php';
-
 /**
  * WP Strava Latest Activities Widget Class
  */
@@ -36,7 +34,7 @@ class WPStrava_LatestActivitiesWidget extends WP_Widget {
 		if ( $title ) {
 			echo $args['before_title'] . $title . $args['after_title'];
 		}
-		echo WPStava_LatestActivities::get_activities_html( $activities_args );
+		echo WPStrava_LatestActivities::get_activities_html( $activities_args );
 		echo $args['after_widget'];
 	}
 

lib/WPStrava/SOM.php

@@ -13,11 +13,9 @@ abstract class WPStrava_SOM {
 	public static function get_som( $som = null ) {
 		$som = $som ? $som : WPStrava::get_instance()->settings->som;
 		if ( 'english' === $som ) {
-			require_once WPSTRAVA_PLUGIN_DIR . 'lib/SOMEnglish.class.php';
 			return new WPStrava_SOMEnglish();
 		}
 		// Default to metric.
-		require_once WPSTRAVA_PLUGIN_DIR . 'lib/SOMMetric.class.php';
 		return new WPStrava_SOMMetric();
 	}
 

lib/WPStrava/Settings.php

@@ -289,7 +289,6 @@ class WPStrava_Settings {
 		delete_option( 'strava_client_secret' );
 
 		if ( $client_id && $client_secret ) {
-			require_once WPSTRAVA_PLUGIN_DIR . 'lib/API.class.php';
 			$api  = new WPStrava_API();
 			$data = array(
 				'client_id'     => $client_id,