gravityview / GravityView

includes/extensions/edit-entry/class-edit-entry.php

Indentation +169 added lines, -169 removed lines

@@ -18,84 +18,84 @@ 
 
 class GravityView_Edit_Entry {
 
-    /**
-     * @var string
-     */
+	/**
+	 * @var string
+	 */
 	static $file;
 
 	static $instance;
 
-    /**
-     * Component instances.
-     * @var array
-     */
-    public $instances = array();
+	/**
+	 * Component instances.
+	 * @var array
+	 */
+	public $instances = array();
 
 
 	function __construct() {
 
-        self::$file = plugin_dir_path( __FILE__ );
+		self::$file = plugin_dir_path( __FILE__ );
 
-        if( is_admin() ) {
-            $this->load_components( 'admin' );
-        }
+		if( is_admin() ) {
+			$this->load_components( 'admin' );
+		}
 
 		$this->load_components( 'locking' );
 
-        $this->load_components( 'render' );
+		$this->load_components( 'render' );
 
-        // If GF User Registration Add-on exists
-        $this->load_components( 'user-registration' );
+		// If GF User Registration Add-on exists
+		$this->load_components( 'user-registration' );
 
-        $this->add_hooks();
+		$this->add_hooks();
 
 		// Process hooks for addons that may or may not be present
 		$this->addon_specific_hooks();
 	}
 
 
-    static function getInstance() {
+	static function getInstance() {
 
-        if( empty( self::$instance ) ) {
-            self::$instance = new GravityView_Edit_Entry;
-        }
+		if( empty( self::$instance ) ) {
+			self::$instance = new GravityView_Edit_Entry;
+		}
 
-        return self::$instance;
-    }
+		return self::$instance;
+	}
 
 
-    private function load_components( $component ) {
+	private function load_components( $component ) {
 
-        $dir = trailingslashit( self::$file );
+		$dir = trailingslashit( self::$file );
 
-        $filename  = $dir . 'class-edit-entry-' . $component . '.php';
-        $classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
+		$filename  = $dir . 'class-edit-entry-' . $component . '.php';
+		$classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
 
-        // Loads component and pass extension's instance so that component can
-        // talk each other.
-        require_once $filename;
-        $this->instances[ $component ] = new $classname( $this );
-        $this->instances[ $component ]->load();
+		// Loads component and pass extension's instance so that component can
+		// talk each other.
+		require_once $filename;
+		$this->instances[ $component ] = new $classname( $this );
+		$this->instances[ $component ]->load();
 
-    }
+	}
 
-    private function add_hooks() {
+	private function add_hooks() {
 
-        // Add front-end access to Gravity Forms delete file action
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( $this, 'delete_file') );
+		// Add front-end access to Gravity Forms delete file action
+		add_action( 'wp_ajax_nopriv_rg_delete_file', array( $this, 'delete_file') );
 
-        // Make sure this hook is run for non-admins
-        add_action( 'wp_ajax_rg_delete_file', array( $this, 'delete_file') );
+		// Make sure this hook is run for non-admins
+		add_action( 'wp_ajax_rg_delete_file', array( $this, 'delete_file') );
 
-        add_filter( 'gravityview_blocklist_field_types', array( $this, 'modify_field_blocklist' ), 10, 2 );
+		add_filter( 'gravityview_blocklist_field_types', array( $this, 'modify_field_blocklist' ), 10, 2 );
 
-        // add template path to check for field
-        add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
+		// add template path to check for field
+		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
 
 		add_filter( 'gravityview/field/is_visible', array( $this, 'maybe_not_visible' ), 10, 3 );
 
 		add_filter( 'gravityview/api/reserved_query_args', array( $this, 'add_reserved_arg' ) );
-    }
+	}
 
 	/**
 	 * Adds "edit" to the list of internal reserved query args
@@ -166,87 +166,87 @@ 
 		return false;
 	}
 
-    /**
-     * Include this extension templates path
-     * @param array $file_paths List of template paths ordered
-     */
-    public function add_template_path( $file_paths ) {
-
-        // Index 100 is the default GravityView template path.
-        $file_paths[ 110 ] = self::$file;
-
-        return $file_paths;
-    }
-
-    /**
-     *
-     * Return a well formatted nonce key according to GravityView Edit Entry protocol
-     *
-     * @param $view_id int GravityView view id
-     * @param $form_id int Gravity Forms form id
-     * @param $entry_id int Gravity Forms entry id
-     * @return string
-     */
-    public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
-        return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
-    }
-
-
-    /**
-     * The edit entry link creates a secure link with a nonce
-     *
-     * It also mimics the URL structure Gravity Forms expects to have so that
-     * it formats the display of the edit form like it does in the backend, like
-     * "You can edit this post from the post page" fields, for example.
-     *
-     * @param $entry array Gravity Forms entry object
-     * @param $view_id int GravityView view id
-     * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
-     * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
-     * @return string
-     */
-    public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
-
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
-
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
-
-        $url = add_query_arg( array(
-            'edit' => wp_create_nonce( $nonce_key )
-        ), $base );
-
-	    if ( $post_id ) {
-		    $url = add_query_arg( array( 'gvid' => $view_id ), $url );
-	    }
-
-	    /**
-	     * Allow passing params to dynamically populate entry with values
-	     * @since 1.9.2
-	     */
-	    if( !empty( $field_values ) ) {
-
-		    if( is_array( $field_values ) ) {
-			    // If already an array, no parse_str() needed
-			    $params = $field_values;
-		    } else {
-			    parse_str( $field_values, $params );
-		    }
-
-		    $url = add_query_arg( $params, $url );
-	    }
-
-	    /**
-	     * @filter `gravityview/edit/link` Filter the edit URL link.
-	     *
-	     * @since  2.14.6 Added $post param.
-	     *
-	     * @param string   $url   The url.
-	     * @param array    $entry The entry.
-	     * @param \GV\View $view  The View.
-	     * @param WP_Post|null WP_Post $post WP post.
-	     */
-	    return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id ), get_post( $view_id ) );
-    }
+	/**
+	 * Include this extension templates path
+	 * @param array $file_paths List of template paths ordered
+	 */
+	public function add_template_path( $file_paths ) {
+
+		// Index 100 is the default GravityView template path.
+		$file_paths[ 110 ] = self::$file;
+
+		return $file_paths;
+	}
+
+	/**
+	 *
+	 * Return a well formatted nonce key according to GravityView Edit Entry protocol
+	 *
+	 * @param $view_id int GravityView view id
+	 * @param $form_id int Gravity Forms form id
+	 * @param $entry_id int Gravity Forms entry id
+	 * @return string
+	 */
+	public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
+		return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
+	}
+
+
+	/**
+	 * The edit entry link creates a secure link with a nonce
+	 *
+	 * It also mimics the URL structure Gravity Forms expects to have so that
+	 * it formats the display of the edit form like it does in the backend, like
+	 * "You can edit this post from the post page" fields, for example.
+	 *
+	 * @param $entry array Gravity Forms entry object
+	 * @param $view_id int GravityView view id
+	 * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
+	 * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
+	 * @return string
+	 */
+	public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
+
+		$nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
+
+		$base = gv_entry_link( $entry, $post_id ? : $view_id  );
+
+		$url = add_query_arg( array(
+			'edit' => wp_create_nonce( $nonce_key )
+		), $base );
+
+		if ( $post_id ) {
+			$url = add_query_arg( array( 'gvid' => $view_id ), $url );
+		}
+
+		/**
+		 * Allow passing params to dynamically populate entry with values
+		 * @since 1.9.2
+		 */
+		if( !empty( $field_values ) ) {
+
+			if( is_array( $field_values ) ) {
+				// If already an array, no parse_str() needed
+				$params = $field_values;
+			} else {
+				parse_str( $field_values, $params );
+			}
+
+			$url = add_query_arg( $params, $url );
+		}
+
+		/**
+		 * @filter `gravityview/edit/link` Filter the edit URL link.
+		 *
+		 * @since  2.14.6 Added $post param.
+		 *
+		 * @param string   $url   The url.
+		 * @param array    $entry The entry.
+		 * @param \GV\View $view  The View.
+		 * @param WP_Post|null WP_Post $post WP post.
+		 */
+		return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id ), get_post( $view_id ) );
+	}
 
 	/**
 	 * @depecated 2.14 Use {@see GravityView_Edit_Entry::modify_field_blocklist()}
@@ -337,19 +337,19 @@ 
 	}
 
 
-    /**
-     * checks if user has permissions to edit a specific entry
-     *
-     * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
-     *
-     * @param  array $entry Gravity Forms entry array
-     * @param \GV\View|int $view ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
-     * @return bool
-     */
-    public static function check_user_cap_edit_entry( $entry, $view = 0 ) {
+	/**
+	 * checks if user has permissions to edit a specific entry
+	 *
+	 * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
+	 *
+	 * @param  array $entry Gravity Forms entry array
+	 * @param \GV\View|int $view ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
+	 * @return bool
+	 */
+	public static function check_user_cap_edit_entry( $entry, $view = 0 ) {
 
-        // No permission by default
-        $user_can_edit = false;
+		// No permission by default
+		$user_can_edit = false;
 
 		// get user_edit setting
 		if ( empty( $view ) ) {
@@ -367,60 +367,60 @@ 
 			$user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
 		}
 
-        // If they can edit any entries (as defined in Gravity Forms)
-        // Or if they can edit other people's entries
-        // Then we're good.
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
+		// If they can edit any entries (as defined in Gravity Forms)
+		// Or if they can edit other people's entries
+		// Then we're good.
+		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
 
-            gravityview()->log->debug( 'User has ability to edit all entries.' );
+			gravityview()->log->debug( 'User has ability to edit all entries.' );
 
-            $user_can_edit = true;
+			$user_can_edit = true;
 
-        } else if( !isset( $entry['created_by'] ) ) {
+		} else if( !isset( $entry['created_by'] ) ) {
 
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
+			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
 
-            $user_can_edit = false;
+			$user_can_edit = false;
 
-        } else {
+		} else {
 
-            $current_user = wp_get_current_user();
+			$current_user = wp_get_current_user();
 
-            // User edit is disabled
-            if( empty( $user_edit ) ) {
+			// User edit is disabled
+			if( empty( $user_edit ) ) {
 
-                gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
+				gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
 
-                $user_can_edit = false;
-            }
+				$user_can_edit = false;
+			}
 
-            // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
+			// User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
+			else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
 
-                gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
+				gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
 
-                $user_can_edit = true;
+				$user_can_edit = true;
 
-            } else if( ! is_user_logged_in() ) {
+			} else if( ! is_user_logged_in() ) {
 
-                gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
+				gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
 
-	            $user_can_edit = false; // Here just for clarity
-            }
+				$user_can_edit = false; // Here just for clarity
+			}
 
-        }
+		}
 
-        /**
-         * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
-         * @since 1.15 Added `$entry` and `$view_id` parameters
-         * @param boolean $user_can_edit Can the current user edit the current entry? (Default: false)
-         * @param array $entry Gravity Forms entry array {@since 1.15}
-         * @param int $view_id ID of the view you want to check visibility against {@since 1.15}
-         */
-        $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
+		/**
+		 * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
+		 * @since 1.15 Added `$entry` and `$view_id` parameters
+		 * @param boolean $user_can_edit Can the current user edit the current entry? (Default: false)
+		 * @param array $entry Gravity Forms entry array {@since 1.15}
+		 * @param int $view_id ID of the view you want to check visibility against {@since 1.15}
+		 */
+		$user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
 
-        return (bool) $user_can_edit;
-    }
+		return (bool) $user_can_edit;
+	}
 
 	/**
 	 * Deletes a file.

vendor_prefixed/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php

Indentation +436 added lines, -436 removed lines

@@ -38,448 +38,448 @@
  */
 class Inflector
 {
-    /**
-     * Plural inflector rules.
-     *
-     * @var array
-     */
-    private static $plural = array(
-        'rules' => array(
-            '/(s)tatus$/i' => '\1\2tatuses',
-            '/(quiz)$/i' => '\1zes',
-            '/^(ox)$/i' => '\1\2en',
-            '/([m|l])ouse$/i' => '\1ice',
-            '/(matr|vert|ind)(ix|ex)$/i' => '\1ices',
-            '/(x|ch|ss|sh)$/i' => '\1es',
-            '/([^aeiouy]|qu)y$/i' => '\1ies',
-            '/(hive)$/i' => '\1s',
-            '/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
-            '/sis$/i' => 'ses',
-            '/([ti])um$/i' => '\1a',
-            '/(p)erson$/i' => '\1eople',
-            '/(m)an$/i' => '\1en',
-            '/(c)hild$/i' => '\1hildren',
-            '/(f)oot$/i' => '\1eet',
-            '/(buffal|her|potat|tomat|volcan)o$/i' => '\1\2oes',
-            '/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|vir)us$/i' => '\1i',
-            '/us$/i' => 'uses',
-            '/(alias)$/i' => '\1es',
-            '/(analys|ax|cris|test|thes)is$/i' => '\1es',
-            '/s$/' => 's',
-            '/^$/' => '',
-            '/$/' => 's',
-        ),
-        'uninflected' => array(
-            '.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', 'people', 'cookie'
-        ),
-        'irregular' => array(
-            'atlas' => 'atlases',
-            'axe' => 'axes',
-            'beef' => 'beefs',
-            'brother' => 'brothers',
-            'cafe' => 'cafes',
-            'chateau' => 'chateaux',
-            'child' => 'children',
-            'cookie' => 'cookies',
-            'corpus' => 'corpuses',
-            'cow' => 'cows',
-            'criterion' => 'criteria',
-            'curriculum' => 'curricula',
-            'demo' => 'demos',
-            'domino' => 'dominoes',
-            'echo' => 'echoes',
-            'foot' => 'feet',
-            'fungus' => 'fungi',
-            'ganglion' => 'ganglions',
-            'genie' => 'genies',
-            'genus' => 'genera',
-            'graffito' => 'graffiti',
-            'hippopotamus' => 'hippopotami',
-            'hoof' => 'hoofs',
-            'human' => 'humans',
-            'iris' => 'irises',
-            'leaf' => 'leaves',
-            'loaf' => 'loaves',
-            'man' => 'men',
-            'medium' => 'media',
-            'memorandum' => 'memoranda',
-            'money' => 'monies',
-            'mongoose' => 'mongooses',
-            'motto' => 'mottoes',
-            'move' => 'moves',
-            'mythos' => 'mythoi',
-            'niche' => 'niches',
-            'nucleus' => 'nuclei',
-            'numen' => 'numina',
-            'occiput' => 'occiputs',
-            'octopus' => 'octopuses',
-            'opus' => 'opuses',
-            'ox' => 'oxen',
-            'penis' => 'penises',
-            'person' => 'people',
-            'plateau' => 'plateaux',
-            'runner-up' => 'runners-up',
-            'sex' => 'sexes',
-            'soliloquy' => 'soliloquies',
-            'son-in-law' => 'sons-in-law',
-            'syllabus' => 'syllabi',
-            'testis' => 'testes',
-            'thief' => 'thieves',
-            'tooth' => 'teeth',
-            'tornado' => 'tornadoes',
-            'trilby' => 'trilbys',
-            'turf' => 'turfs',
-            'volcano' => 'volcanoes',
-        )
-    );
-
-    /**
-     * Singular inflector rules.
-     *
-     * @var array
-     */
-    private static $singular = array(
-        'rules' => array(
-            '/(s)tatuses$/i' => '\1\2tatus',
-            '/^(.*)(menu)s$/i' => '\1\2',
-            '/(quiz)zes$/i' => '\\1',
-            '/(matr)ices$/i' => '\1ix',
-            '/(vert|ind)ices$/i' => '\1ex',
-            '/^(ox)en/i' => '\1',
-            '/(alias)(es)*$/i' => '\1',
-            '/(buffal|her|potat|tomat|volcan)oes$/i' => '\1o',
-            '/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|viri?)i$/i' => '\1us',
-            '/([ftw]ax)es/i' => '\1',
-            '/(analys|ax|cris|test|thes)es$/i' => '\1is',
-            '/(shoe|slave)s$/i' => '\1',
-            '/(o)es$/i' => '\1',
-            '/ouses$/' => 'ouse',
-            '/([^a])uses$/' => '\1us',
-            '/([m|l])ice$/i' => '\1ouse',
-            '/(x|ch|ss|sh)es$/i' => '\1',
-            '/(m)ovies$/i' => '\1\2ovie',
-            '/(s)eries$/i' => '\1\2eries',
-            '/([^aeiouy]|qu)ies$/i' => '\1y',
-            '/([lr])ves$/i' => '\1f',
-            '/(tive)s$/i' => '\1',
-            '/(hive)s$/i' => '\1',
-            '/(drive)s$/i' => '\1',
-            '/([^fo])ves$/i' => '\1fe',
-            '/(^analy)ses$/i' => '\1sis',
-            '/(analy|diagno|^ba|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
-            '/([ti])a$/i' => '\1um',
-            '/(p)eople$/i' => '\1\2erson',
-            '/(m)en$/i' => '\1an',
-            '/(c)hildren$/i' => '\1\2hild',
-            '/(f)eet$/i' => '\1oot',
-            '/(n)ews$/i' => '\1\2ews',
-            '/eaus$/' => 'eau',
-            '/^(.*us)$/' => '\\1',
-            '/s$/i' => '',
-        ),
-        'uninflected' => array(
-            '.*[nrlm]ese',
-            '.*deer',
-            '.*fish',
-            '.*measles',
-            '.*ois',
-            '.*pox',
-            '.*sheep',
-            '.*ss',
-        ),
-        'irregular' => array(
-            'criteria'  => 'criterion',
-            'curves'    => 'curve',
-            'emphases'  => 'emphasis',
-            'foes'      => 'foe',
-            'hoaxes'    => 'hoax',
-            'media'     => 'medium',
-            'neuroses'  => 'neurosis',
-            'waves'     => 'wave',
-            'oases'     => 'oasis',
-        )
-    );
-
-    /**
-     * Words that should not be inflected.
-     *
-     * @var array
-     */
-    private static $uninflected = array(
-        'Amoyese', 'bison', 'Borghese', 'bream', 'breeches', 'britches', 'buffalo', 'cantus',
-        'carp', 'chassis', 'clippers', 'cod', 'coitus', 'Congoese', 'contretemps', 'corps',
-        'debris', 'diabetes', 'djinn', 'eland', 'elk', 'equipment', 'Faroese', 'flounder',
-        'Foochowese', 'gallows', 'Genevese', 'Genoese', 'Gilbertese', 'graffiti',
-        'headquarters', 'herpes', 'hijinks', 'Hottentotese', 'information', 'innings',
-        'jackanapes', 'Kiplingese', 'Kongoese', 'Lucchese', 'mackerel', 'Maltese', '.*?media',
-        'mews', 'moose', 'mumps', 'Nankingese', 'news', 'nexus', 'Niasese',
-        'Pekingese', 'Piedmontese', 'pincers', 'Pistoiese', 'pliers', 'Portuguese',
-        'proceedings', 'rabies', 'rice', 'rhinoceros', 'salmon', 'Sarawakese', 'scissors',
-        'sea[- ]bass', 'series', 'Shavese', 'shears', 'siemens', 'species', 'staff', 'swine',
-        'testes', 'trousers', 'trout', 'tuna', 'Vermontese', 'Wenchowese', 'whiting',
-        'wildebeest', 'Yengeese'
-    );
-
-    /**
-     * Method cache array.
-     *
-     * @var array
-     */
-    private static $cache = array();
-
-    /**
-     * The initial state of Inflector so reset() works.
-     *
-     * @var array
-     */
-    private static $initialState = array();
-
-    /**
-     * Converts a word into the format for a Doctrine table name. Converts 'ModelName' to 'model_name'.
-     *
-     * @param string $word The word to tableize.
-     *
-     * @return string The tableized word.
-     */
-    public static function tableize($word)
-    {
-        return strtolower(preg_replace('~(?<=\\w)([A-Z])~', '_$1', $word));
-    }
-
-    /**
-     * Converts a word into the format for a Doctrine class name. Converts 'table_name' to 'TableName'.
-     *
-     * @param string $word The word to classify.
-     *
-     * @return string The classified word.
-     */
-    public static function classify($word)
-    {
-        return str_replace(" ", "", ucwords(strtr($word, "_-", "  ")));
-    }
-
-    /**
-     * Camelizes a word. This uses the classify() method and turns the first character to lowercase.
-     *
-     * @param string $word The word to camelize.
-     *
-     * @return string The camelized word.
-     */
-    public static function camelize($word)
-    {
-        return lcfirst(self::classify($word));
-    }
-
-    /**
-     * Uppercases words with configurable delimeters between words.
-     *
-     * Takes a string and capitalizes all of the words, like PHP's built-in
-     * ucwords function.  This extends that behavior, however, by allowing the
-     * word delimeters to be configured, rather than only separating on
-     * whitespace.
-     *
-     * Here is an example:
-     * <code>
-     * <?php
-     * $string = 'top-o-the-morning to all_of_you!';
-     * echo \Doctrine\Common\Inflector\Inflector::ucwords($string);
-     * // Top-O-The-Morning To All_of_you!
-     *
-     * echo \Doctrine\Common\Inflector\Inflector::ucwords($string, '-_ ');
-     * // Top-O-The-Morning To All_Of_You!
-     * ?>
-     * </code>
-     *
-     * @param string $string The string to operate on.
-     * @param string $delimiters A list of word separators.
-     *
-     * @return string The string with all delimeter-separated words capitalized.
-     */
-    public static function ucwords($string, $delimiters = " \n\t\r\0\x0B-")
-    {
-        return preg_replace_callback(
-            '/[^' . preg_quote($delimiters, '/') . ']+/',
-            function($matches) {
-                return ucfirst($matches[0]);
-            },
-            $string
-        );
-    }
-
-    /**
-     * Clears Inflectors inflected value caches, and resets the inflection
-     * rules to the initial values.
-     *
-     * @return void
-     */
-    public static function reset()
-    {
-        if (empty(self::$initialState)) {
-            self::$initialState = get_class_vars('Inflector');
-
-            return;
-        }
-
-        foreach (self::$initialState as $key => $val) {
-            if ($key != 'initialState') {
-                self::${$key} = $val;
-            }
-        }
-    }
-
-    /**
-     * Adds custom inflection $rules, of either 'plural' or 'singular' $type.
-     *
-     * ### Usage:
-     *
-     * {{{
-     * Inflector::rules('plural', array('/^(inflect)or$/i' => '\1ables'));
-     * Inflector::rules('plural', array(
-     *     'rules' => array('/^(inflect)ors$/i' => '\1ables'),
-     *     'uninflected' => array('dontinflectme'),
-     *     'irregular' => array('red' => 'redlings')
-     * ));
-     * }}}
-     *
-     * @param string  $type  The type of inflection, either 'plural' or 'singular'
-     * @param array   $rules An array of rules to be added.
-     * @param boolean $reset If true, will unset default inflections for all
-     *                       new rules that are being defined in $rules.
-     *
-     * @return void
-     */
-    public static function rules($type, $rules, $reset = false)
-    {
-        foreach ($rules as $rule => $pattern) {
-            if ( ! is_array($pattern)) {
-                continue;
-            }
-
-            if ($reset) {
-                self::${$type}[$rule] = $pattern;
-            } else {
-                self::${$type}[$rule] = ($rule === 'uninflected')
-                    ? array_merge($pattern, self::${$type}[$rule])
-                    : $pattern + self::${$type}[$rule];
-            }
-
-            unset($rules[$rule], self::${$type}['cache' . ucfirst($rule)]);
-
-            if (isset(self::${$type}['merged'][$rule])) {
-                unset(self::${$type}['merged'][$rule]);
-            }
-
-            if ($type === 'plural') {
-                self::$cache['pluralize'] = self::$cache['tableize'] = array();
-            } elseif ($type === 'singular') {
-                self::$cache['singularize'] = array();
-            }
-        }
-
-        self::${$type}['rules'] = $rules + self::${$type}['rules'];
-    }
-
-    /**
-     * Returns a word in plural form.
-     *
-     * @param string $word The word in singular form.
-     *
-     * @return string The word in plural form.
-     */
-    public static function pluralize($word)
-    {
-        if (isset(self::$cache['pluralize'][$word])) {
-            return self::$cache['pluralize'][$word];
-        }
-
-        if (!isset(self::$plural['merged']['irregular'])) {
-            self::$plural['merged']['irregular'] = self::$plural['irregular'];
-        }
-
-        if (!isset(self::$plural['merged']['uninflected'])) {
-            self::$plural['merged']['uninflected'] = array_merge(self::$plural['uninflected'], self::$uninflected);
-        }
-
-        if (!isset(self::$plural['cacheUninflected']) || !isset(self::$plural['cacheIrregular'])) {
-            self::$plural['cacheUninflected'] = '(?:' . implode('|', self::$plural['merged']['uninflected']) . ')';
-            self::$plural['cacheIrregular']   = '(?:' . implode('|', array_keys(self::$plural['merged']['irregular'])) . ')';
-        }
-
-        if (preg_match('/(.*)\\b(' . self::$plural['cacheIrregular'] . ')$/i', $word, $regs)) {
-            self::$cache['pluralize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$plural['merged']['irregular'][strtolower($regs[2])], 1);
+	/**
+	 * Plural inflector rules.
+	 *
+	 * @var array
+	 */
+	private static $plural = array(
+		'rules' => array(
+			'/(s)tatus$/i' => '\1\2tatuses',
+			'/(quiz)$/i' => '\1zes',
+			'/^(ox)$/i' => '\1\2en',
+			'/([m|l])ouse$/i' => '\1ice',
+			'/(matr|vert|ind)(ix|ex)$/i' => '\1ices',
+			'/(x|ch|ss|sh)$/i' => '\1es',
+			'/([^aeiouy]|qu)y$/i' => '\1ies',
+			'/(hive)$/i' => '\1s',
+			'/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
+			'/sis$/i' => 'ses',
+			'/([ti])um$/i' => '\1a',
+			'/(p)erson$/i' => '\1eople',
+			'/(m)an$/i' => '\1en',
+			'/(c)hild$/i' => '\1hildren',
+			'/(f)oot$/i' => '\1eet',
+			'/(buffal|her|potat|tomat|volcan)o$/i' => '\1\2oes',
+			'/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|vir)us$/i' => '\1i',
+			'/us$/i' => 'uses',
+			'/(alias)$/i' => '\1es',
+			'/(analys|ax|cris|test|thes)is$/i' => '\1es',
+			'/s$/' => 's',
+			'/^$/' => '',
+			'/$/' => 's',
+		),
+		'uninflected' => array(
+			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', 'people', 'cookie'
+		),
+		'irregular' => array(
+			'atlas' => 'atlases',
+			'axe' => 'axes',
+			'beef' => 'beefs',
+			'brother' => 'brothers',
+			'cafe' => 'cafes',
+			'chateau' => 'chateaux',
+			'child' => 'children',
+			'cookie' => 'cookies',
+			'corpus' => 'corpuses',
+			'cow' => 'cows',
+			'criterion' => 'criteria',
+			'curriculum' => 'curricula',
+			'demo' => 'demos',
+			'domino' => 'dominoes',
+			'echo' => 'echoes',
+			'foot' => 'feet',
+			'fungus' => 'fungi',
+			'ganglion' => 'ganglions',
+			'genie' => 'genies',
+			'genus' => 'genera',
+			'graffito' => 'graffiti',
+			'hippopotamus' => 'hippopotami',
+			'hoof' => 'hoofs',
+			'human' => 'humans',
+			'iris' => 'irises',
+			'leaf' => 'leaves',
+			'loaf' => 'loaves',
+			'man' => 'men',
+			'medium' => 'media',
+			'memorandum' => 'memoranda',
+			'money' => 'monies',
+			'mongoose' => 'mongooses',
+			'motto' => 'mottoes',
+			'move' => 'moves',
+			'mythos' => 'mythoi',
+			'niche' => 'niches',
+			'nucleus' => 'nuclei',
+			'numen' => 'numina',
+			'occiput' => 'occiputs',
+			'octopus' => 'octopuses',
+			'opus' => 'opuses',
+			'ox' => 'oxen',
+			'penis' => 'penises',
+			'person' => 'people',
+			'plateau' => 'plateaux',
+			'runner-up' => 'runners-up',
+			'sex' => 'sexes',
+			'soliloquy' => 'soliloquies',
+			'son-in-law' => 'sons-in-law',
+			'syllabus' => 'syllabi',
+			'testis' => 'testes',
+			'thief' => 'thieves',
+			'tooth' => 'teeth',
+			'tornado' => 'tornadoes',
+			'trilby' => 'trilbys',
+			'turf' => 'turfs',
+			'volcano' => 'volcanoes',
+		)
+	);
+
+	/**
+	 * Singular inflector rules.
+	 *
+	 * @var array
+	 */
+	private static $singular = array(
+		'rules' => array(
+			'/(s)tatuses$/i' => '\1\2tatus',
+			'/^(.*)(menu)s$/i' => '\1\2',
+			'/(quiz)zes$/i' => '\\1',
+			'/(matr)ices$/i' => '\1ix',
+			'/(vert|ind)ices$/i' => '\1ex',
+			'/^(ox)en/i' => '\1',
+			'/(alias)(es)*$/i' => '\1',
+			'/(buffal|her|potat|tomat|volcan)oes$/i' => '\1o',
+			'/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|viri?)i$/i' => '\1us',
+			'/([ftw]ax)es/i' => '\1',
+			'/(analys|ax|cris|test|thes)es$/i' => '\1is',
+			'/(shoe|slave)s$/i' => '\1',
+			'/(o)es$/i' => '\1',
+			'/ouses$/' => 'ouse',
+			'/([^a])uses$/' => '\1us',
+			'/([m|l])ice$/i' => '\1ouse',
+			'/(x|ch|ss|sh)es$/i' => '\1',
+			'/(m)ovies$/i' => '\1\2ovie',
+			'/(s)eries$/i' => '\1\2eries',
+			'/([^aeiouy]|qu)ies$/i' => '\1y',
+			'/([lr])ves$/i' => '\1f',
+			'/(tive)s$/i' => '\1',
+			'/(hive)s$/i' => '\1',
+			'/(drive)s$/i' => '\1',
+			'/([^fo])ves$/i' => '\1fe',
+			'/(^analy)ses$/i' => '\1sis',
+			'/(analy|diagno|^ba|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
+			'/([ti])a$/i' => '\1um',
+			'/(p)eople$/i' => '\1\2erson',
+			'/(m)en$/i' => '\1an',
+			'/(c)hildren$/i' => '\1\2hild',
+			'/(f)eet$/i' => '\1oot',
+			'/(n)ews$/i' => '\1\2ews',
+			'/eaus$/' => 'eau',
+			'/^(.*us)$/' => '\\1',
+			'/s$/i' => '',
+		),
+		'uninflected' => array(
+			'.*[nrlm]ese',
+			'.*deer',
+			'.*fish',
+			'.*measles',
+			'.*ois',
+			'.*pox',
+			'.*sheep',
+			'.*ss',
+		),
+		'irregular' => array(
+			'criteria'  => 'criterion',
+			'curves'    => 'curve',
+			'emphases'  => 'emphasis',
+			'foes'      => 'foe',
+			'hoaxes'    => 'hoax',
+			'media'     => 'medium',
+			'neuroses'  => 'neurosis',
+			'waves'     => 'wave',
+			'oases'     => 'oasis',
+		)
+	);
+
+	/**
+	 * Words that should not be inflected.
+	 *
+	 * @var array
+	 */
+	private static $uninflected = array(
+		'Amoyese', 'bison', 'Borghese', 'bream', 'breeches', 'britches', 'buffalo', 'cantus',
+		'carp', 'chassis', 'clippers', 'cod', 'coitus', 'Congoese', 'contretemps', 'corps',
+		'debris', 'diabetes', 'djinn', 'eland', 'elk', 'equipment', 'Faroese', 'flounder',
+		'Foochowese', 'gallows', 'Genevese', 'Genoese', 'Gilbertese', 'graffiti',
+		'headquarters', 'herpes', 'hijinks', 'Hottentotese', 'information', 'innings',
+		'jackanapes', 'Kiplingese', 'Kongoese', 'Lucchese', 'mackerel', 'Maltese', '.*?media',
+		'mews', 'moose', 'mumps', 'Nankingese', 'news', 'nexus', 'Niasese',
+		'Pekingese', 'Piedmontese', 'pincers', 'Pistoiese', 'pliers', 'Portuguese',
+		'proceedings', 'rabies', 'rice', 'rhinoceros', 'salmon', 'Sarawakese', 'scissors',
+		'sea[- ]bass', 'series', 'Shavese', 'shears', 'siemens', 'species', 'staff', 'swine',
+		'testes', 'trousers', 'trout', 'tuna', 'Vermontese', 'Wenchowese', 'whiting',
+		'wildebeest', 'Yengeese'
+	);
+
+	/**
+	 * Method cache array.
+	 *
+	 * @var array
+	 */
+	private static $cache = array();
+
+	/**
+	 * The initial state of Inflector so reset() works.
+	 *
+	 * @var array
+	 */
+	private static $initialState = array();
+
+	/**
+	 * Converts a word into the format for a Doctrine table name. Converts 'ModelName' to 'model_name'.
+	 *
+	 * @param string $word The word to tableize.
+	 *
+	 * @return string The tableized word.
+	 */
+	public static function tableize($word)
+	{
+		return strtolower(preg_replace('~(?<=\\w)([A-Z])~', '_$1', $word));
+	}
+
+	/**
+	 * Converts a word into the format for a Doctrine class name. Converts 'table_name' to 'TableName'.
+	 *
+	 * @param string $word The word to classify.
+	 *
+	 * @return string The classified word.
+	 */
+	public static function classify($word)
+	{
+		return str_replace(" ", "", ucwords(strtr($word, "_-", "  ")));
+	}
+
+	/**
+	 * Camelizes a word. This uses the classify() method and turns the first character to lowercase.
+	 *
+	 * @param string $word The word to camelize.
+	 *
+	 * @return string The camelized word.
+	 */
+	public static function camelize($word)
+	{
+		return lcfirst(self::classify($word));
+	}
+
+	/**
+	 * Uppercases words with configurable delimeters between words.
+	 *
+	 * Takes a string and capitalizes all of the words, like PHP's built-in
+	 * ucwords function.  This extends that behavior, however, by allowing the
+	 * word delimeters to be configured, rather than only separating on
+	 * whitespace.
+	 *
+	 * Here is an example:
+	 * <code>
+	 * <?php
+	 * $string = 'top-o-the-morning to all_of_you!';
+	 * echo \Doctrine\Common\Inflector\Inflector::ucwords($string);
+	 * // Top-O-The-Morning To All_of_you!
+	 *
+	 * echo \Doctrine\Common\Inflector\Inflector::ucwords($string, '-_ ');
+	 * // Top-O-The-Morning To All_Of_You!
+	 * ?>
+	 * </code>
+	 *
+	 * @param string $string The string to operate on.
+	 * @param string $delimiters A list of word separators.
+	 *
+	 * @return string The string with all delimeter-separated words capitalized.
+	 */
+	public static function ucwords($string, $delimiters = " \n\t\r\0\x0B-")
+	{
+		return preg_replace_callback(
+			'/[^' . preg_quote($delimiters, '/') . ']+/',
+			function($matches) {
+				return ucfirst($matches[0]);
+			},
+			$string
+		);
+	}
+
+	/**
+	 * Clears Inflectors inflected value caches, and resets the inflection
+	 * rules to the initial values.
+	 *
+	 * @return void
+	 */
+	public static function reset()
+	{
+		if (empty(self::$initialState)) {
+			self::$initialState = get_class_vars('Inflector');
+
+			return;
+		}
+
+		foreach (self::$initialState as $key => $val) {
+			if ($key != 'initialState') {
+				self::${$key} = $val;
+			}
+		}
+	}
+
+	/**
+	 * Adds custom inflection $rules, of either 'plural' or 'singular' $type.
+	 *
+	 * ### Usage:
+	 *
+	 * {{{
+	 * Inflector::rules('plural', array('/^(inflect)or$/i' => '\1ables'));
+	 * Inflector::rules('plural', array(
+	 *     'rules' => array('/^(inflect)ors$/i' => '\1ables'),
+	 *     'uninflected' => array('dontinflectme'),
+	 *     'irregular' => array('red' => 'redlings')
+	 * ));
+	 * }}}
+	 *
+	 * @param string  $type  The type of inflection, either 'plural' or 'singular'
+	 * @param array   $rules An array of rules to be added.
+	 * @param boolean $reset If true, will unset default inflections for all
+	 *                       new rules that are being defined in $rules.
+	 *
+	 * @return void
+	 */
+	public static function rules($type, $rules, $reset = false)
+	{
+		foreach ($rules as $rule => $pattern) {
+			if ( ! is_array($pattern)) {
+				continue;
+			}
+
+			if ($reset) {
+				self::${$type}[$rule] = $pattern;
+			} else {
+				self::${$type}[$rule] = ($rule === 'uninflected')
+					? array_merge($pattern, self::${$type}[$rule])
+					: $pattern + self::${$type}[$rule];
+			}
+
+			unset($rules[$rule], self::${$type}['cache' . ucfirst($rule)]);
+
+			if (isset(self::${$type}['merged'][$rule])) {
+				unset(self::${$type}['merged'][$rule]);
+			}
+
+			if ($type === 'plural') {
+				self::$cache['pluralize'] = self::$cache['tableize'] = array();
+			} elseif ($type === 'singular') {
+				self::$cache['singularize'] = array();
+			}
+		}
+
+		self::${$type}['rules'] = $rules + self::${$type}['rules'];
+	}
+
+	/**
+	 * Returns a word in plural form.
+	 *
+	 * @param string $word The word in singular form.
+	 *
+	 * @return string The word in plural form.
+	 */
+	public static function pluralize($word)
+	{
+		if (isset(self::$cache['pluralize'][$word])) {
+			return self::$cache['pluralize'][$word];
+		}
+
+		if (!isset(self::$plural['merged']['irregular'])) {
+			self::$plural['merged']['irregular'] = self::$plural['irregular'];
+		}
+
+		if (!isset(self::$plural['merged']['uninflected'])) {
+			self::$plural['merged']['uninflected'] = array_merge(self::$plural['uninflected'], self::$uninflected);
+		}
+
+		if (!isset(self::$plural['cacheUninflected']) || !isset(self::$plural['cacheIrregular'])) {
+			self::$plural['cacheUninflected'] = '(?:' . implode('|', self::$plural['merged']['uninflected']) . ')';
+			self::$plural['cacheIrregular']   = '(?:' . implode('|', array_keys(self::$plural['merged']['irregular'])) . ')';
+		}
+
+		if (preg_match('/(.*)\\b(' . self::$plural['cacheIrregular'] . ')$/i', $word, $regs)) {
+			self::$cache['pluralize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$plural['merged']['irregular'][strtolower($regs[2])], 1);
             
-            return self::$cache['pluralize'][$word];
-        }
-
-        if (preg_match('/^(' . self::$plural['cacheUninflected'] . ')$/i', $word, $regs)) {
-            self::$cache['pluralize'][$word] = $word;
-
-            return $word;
-        }
-
-        foreach (self::$plural['rules'] as $rule => $replacement) {
-            if (preg_match($rule, $word)) {
-                self::$cache['pluralize'][$word] = preg_replace($rule, $replacement, $word);
-
-                return self::$cache['pluralize'][$word];
-            }
-        }
-    }
-
-    /**
-     * Returns a word in singular form.
-     *
-     * @param string $word The word in plural form.
-     *
-     * @return string The word in singular form.
-     */
-    public static function singularize($word)
-    {
-        if (isset(self::$cache['singularize'][$word])) {
-            return self::$cache['singularize'][$word];
-        }
-
-        if (!isset(self::$singular['merged']['uninflected'])) {
-            self::$singular['merged']['uninflected'] = array_merge(
-                self::$singular['uninflected'],
-                self::$uninflected
-            );
-        }
-
-        if (!isset(self::$singular['merged']['irregular'])) {
-            self::$singular['merged']['irregular'] = array_merge(
-                self::$singular['irregular'],
-                array_flip(self::$plural['irregular'])
-            );
-        }
-
-        if (!isset(self::$singular['cacheUninflected']) || !isset(self::$singular['cacheIrregular'])) {
-            self::$singular['cacheUninflected'] = '(?:' . join('|', self::$singular['merged']['uninflected']) . ')';
-            self::$singular['cacheIrregular'] = '(?:' . join('|', array_keys(self::$singular['merged']['irregular'])) . ')';
-        }
-
-        if (preg_match('/(.*)\\b(' . self::$singular['cacheIrregular'] . ')$/i', $word, $regs)) {
-            self::$cache['singularize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$singular['merged']['irregular'][strtolower($regs[2])], 1);
+			return self::$cache['pluralize'][$word];
+		}
+
+		if (preg_match('/^(' . self::$plural['cacheUninflected'] . ')$/i', $word, $regs)) {
+			self::$cache['pluralize'][$word] = $word;
+
+			return $word;
+		}
+
+		foreach (self::$plural['rules'] as $rule => $replacement) {
+			if (preg_match($rule, $word)) {
+				self::$cache['pluralize'][$word] = preg_replace($rule, $replacement, $word);
+
+				return self::$cache['pluralize'][$word];
+			}
+		}
+	}
+
+	/**
+	 * Returns a word in singular form.
+	 *
+	 * @param string $word The word in plural form.
+	 *
+	 * @return string The word in singular form.
+	 */
+	public static function singularize($word)
+	{
+		if (isset(self::$cache['singularize'][$word])) {
+			return self::$cache['singularize'][$word];
+		}
+
+		if (!isset(self::$singular['merged']['uninflected'])) {
+			self::$singular['merged']['uninflected'] = array_merge(
+				self::$singular['uninflected'],
+				self::$uninflected
+			);
+		}
+
+		if (!isset(self::$singular['merged']['irregular'])) {
+			self::$singular['merged']['irregular'] = array_merge(
+				self::$singular['irregular'],
+				array_flip(self::$plural['irregular'])
+			);
+		}
+
+		if (!isset(self::$singular['cacheUninflected']) || !isset(self::$singular['cacheIrregular'])) {
+			self::$singular['cacheUninflected'] = '(?:' . join('|', self::$singular['merged']['uninflected']) . ')';
+			self::$singular['cacheIrregular'] = '(?:' . join('|', array_keys(self::$singular['merged']['irregular'])) . ')';
+		}
+
+		if (preg_match('/(.*)\\b(' . self::$singular['cacheIrregular'] . ')$/i', $word, $regs)) {
+			self::$cache['singularize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$singular['merged']['irregular'][strtolower($regs[2])], 1);
             
-            return self::$cache['singularize'][$word];
-        }
+			return self::$cache['singularize'][$word];
+		}
 
-        if (preg_match('/^(' . self::$singular['cacheUninflected'] . ')$/i', $word, $regs)) {
-            self::$cache['singularize'][$word] = $word;
+		if (preg_match('/^(' . self::$singular['cacheUninflected'] . ')$/i', $word, $regs)) {
+			self::$cache['singularize'][$word] = $word;
 
-            return $word;
-        }
+			return $word;
+		}
 
-        foreach (self::$singular['rules'] as $rule => $replacement) {
-            if (preg_match($rule, $word)) {
-                self::$cache['singularize'][$word] = preg_replace($rule, $replacement, $word);
+		foreach (self::$singular['rules'] as $rule => $replacement) {
+			if (preg_match($rule, $word)) {
+				self::$cache['singularize'][$word] = preg_replace($rule, $replacement, $word);
 
-                return self::$cache['singularize'][$word];
-            }
-        }
+				return self::$cache['singularize'][$word];
+			}
+		}
 
-        self::$cache['singularize'][$word] = $word;
+		self::$cache['singularize'][$word] = $word;
 
-        return $word;
-    }
+		return $word;
+	}
 }

vendor_prefixed/katzgrau/klogger/src/Logger.php

Indentation +318 added lines, -318 removed lines

@@ -34,322 +34,322 @@
  */

 class Logger extends AbstractLogger

 {

-    /**

-     * KLogger options

-     *  Anything options not considered 'core' to the logging library should be

-     *  settable view the third parameter in the constructor

-     *

-     *  Core options include the log file path and the log threshold

-     *

-     * @var array

-     */

-    protected $options = array (

-        'extension'      => 'txt',

-        'dateFormat'     => 'Y-m-d G:i:s.u',

-        'filename'       => false,

-        'flushFrequency' => false,

-        'prefix'         => 'log_',

-        'logFormat'      => false,

-        'appendContext'  => true,

-    );

-

-    /**

-     * Path to the log file

-     * @var string

-     */

-    private $logFilePath;

-

-    /**

-     * Current minimum logging threshold

-     * @var integer

-     */

-    protected $logLevelThreshold = LogLevel::DEBUG;

-

-    /**

-     * The number of lines logged in this instance's lifetime

-     * @var int

-     */

-    private $logLineCount = 0;

-

-    /**

-     * Log Levels

-     * @var array

-     */

-    protected $logLevels = array(

-        LogLevel::EMERGENCY => 0,

-        LogLevel::ALERT     => 1,

-        LogLevel::CRITICAL  => 2,

-        LogLevel::ERROR     => 3,

-        LogLevel::WARNING   => 4,

-        LogLevel::NOTICE    => 5,

-        LogLevel::INFO      => 6,

-        LogLevel::DEBUG     => 7

-    );

-

-    /**

-     * This holds the file handle for this instance's log file

-     * @var resource

-     */

-    private $fileHandle;

-

-    /**

-     * This holds the last line logged to the logger

-     *  Used for unit tests

-     * @var string

-     */

-    private $lastLine = '';

-

-    /**

-     * Octal notation for default permissions of the log file

-     * @var integer

-     */

-    private $defaultPermissions = 0777;

-

-    /**

-     * Class constructor

-     *

-     * @param string $logDirectory      File path to the logging directory

-     * @param string $logLevelThreshold The LogLevel Threshold

-     * @param array  $options

-     *

-     * @internal param string $logFilePrefix The prefix for the log file name

-     * @internal param string $logFileExt The extension for the log file

-     */

-    public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array())

-    {

-        $this->logLevelThreshold = $logLevelThreshold;

-        $this->options = array_merge($this->options, $options);

-

-        $logDirectory = rtrim($logDirectory, DIRECTORY_SEPARATOR);

-        if ( ! file_exists($logDirectory)) {

-            mkdir($logDirectory, $this->defaultPermissions, true);

-        }

-

-        if(strpos($logDirectory, 'php://') === 0) {

-            $this->setLogToStdOut($logDirectory);

-            $this->setFileHandle('w+');

-        } else {

-            $this->setLogFilePath($logDirectory);

-            if(file_exists($this->logFilePath) && !is_writable($this->logFilePath)) {

-                throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

-            }

-            $this->setFileHandle('a');

-        }

-

-        if ( ! $this->fileHandle) {

-            throw new RuntimeException('The file could not be opened. Check permissions.');

-        }

-    }

-

-    /**

-     * @param string $stdOutPath

-     */

-    public function setLogToStdOut($stdOutPath) {

-        $this->logFilePath = $stdOutPath;

-    }

-

-    /**

-     * @param string $logDirectory

-     */

-    public function setLogFilePath($logDirectory) {

-        if ($this->options['filename']) {

-            if (strpos($this->options['filename'], '.log') !== false || strpos($this->options['filename'], '.txt') !== false) {

-                $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'];

-            }

-            else {

-                $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'].'.'.$this->options['extension'];

-            }

-        } else {

-            $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];

-        }

-    }

-

-    /**

-     * @param $writeMode

-     *

-     * @internal param resource $fileHandle

-     */

-    public function setFileHandle($writeMode) {

-        $this->fileHandle = fopen($this->logFilePath, $writeMode);

-    }

-

-

-    /**

-     * Class destructor

-     */

-    public function __destruct()

-    {

-        if ($this->fileHandle) {

-            fclose($this->fileHandle);

-        }

-    }

-

-    /**

-     * Sets the date format used by all instances of KLogger

-     *

-     * @param string $dateFormat Valid format string for date()

-     */

-    public function setDateFormat($dateFormat)

-    {

-        $this->options['dateFormat'] = $dateFormat;

-    }

-

-    /**

-     * Sets the Log Level Threshold

-     *

-     * @param string $logLevelThreshold The log level threshold

-     */

-    public function setLogLevelThreshold($logLevelThreshold)

-    {

-        $this->logLevelThreshold = $logLevelThreshold;

-    }

-

-    /**

-     * Logs with an arbitrary level.

-     *

-     * @param mixed $level

-     * @param string $message

-     * @param array $context

-     * @return null

-     */

-    public function log($level, $message, array $context = array())

-    {

-        if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {

-            return;

-        }

-        $message = $this->formatMessage($level, $message, $context);

-        $this->write($message);

-    }

-

-    /**

-     * Writes a line to the log without prepending a status or timestamp

-     *

-     * @param string $message Line to write to the log

-     * @return void

-     */

-    public function write($message)

-    {

-        if (null !== $this->fileHandle) {

-            if (fwrite($this->fileHandle, $message) === false) {

-                throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

-            } else {

-                $this->lastLine = trim($message);

-                $this->logLineCount++;

-

-                if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {

-                    fflush($this->fileHandle);

-                }

-            }

-        }

-    }

-

-    /**

-     * Get the file path that the log is currently writing to

-     *

-     * @return string

-     */

-    public function getLogFilePath()

-    {

-        return $this->logFilePath;

-    }

-

-    /**

-     * Get the last line logged to the log file

-     *

-     * @return string

-     */

-    public function getLastLogLine()

-    {

-        return $this->lastLine;

-    }

-

-    /**

-     * Formats the message for logging.

-     *

-     * @param  string $level   The Log Level of the message

-     * @param  string $message The message to log

-     * @param  array  $context The context

-     * @return string

-     */

-    protected function formatMessage($level, $message, $context)

-    {

-        if ($this->options['logFormat']) {

-            $parts = array(

-                'date'          => $this->getTimestamp(),

-                'level'         => strtoupper($level),

-                'level-padding' => str_repeat(' ', 9 - strlen($level)),

-                'priority'      => $this->logLevels[$level],

-                'message'       => $message,

-                'context'       => json_encode($context),

-            );

-            $message = $this->options['logFormat'];

-            foreach ($parts as $part => $value) {

-                $message = str_replace('{'.$part.'}', $value, $message);

-            }

-

-        } else {

-            $message = "[{$this->getTimestamp()}] [{$level}] {$message}";

-        }

-

-        if ($this->options['appendContext'] && ! empty($context)) {

-            $message .= PHP_EOL.$this->indent($this->contextToString($context));

-        }

-

-        return $message.PHP_EOL;

-

-    }

-

-    /**

-     * Gets the correctly formatted Date/Time for the log entry.

-     *

-     * PHP DateTime is dump, and you have to resort to trickery to get microseconds

-     * to work correctly, so here it is.

-     *

-     * @return string

-     */

-    private function getTimestamp()

-    {

-        $originalTime = microtime(true);

-        $micro = sprintf("%06d", ($originalTime - floor($originalTime)) * 1000000);

-        $date = new DateTime(date('Y-m-d H:i:s.'.$micro, (int)$originalTime));

-

-        return $date->format($this->options['dateFormat']);

-    }

-

-    /**

-     * Takes the given context and coverts it to a string.

-     *

-     * @param  array $context The Context

-     * @return string

-     */

-    protected function contextToString($context)

-    {

-        $export = '';

-        foreach ($context as $key => $value) {

-            $export .= "{$key}: ";

-            $export .= preg_replace(array(

-                '/=>\s+([a-zA-Z])/im',

-                '/array\(\s+\)/im',

-                '/^  |\G  /m'

-            ), array(

-                '=> $1',

-                'array()',

-                '    '

-            ), str_replace('array (', 'array(', var_export($value, true)));

-            $export .= PHP_EOL;

-        }

-        return str_replace(array('\\\\', '\\\''), array('\\', '\''), rtrim($export));

-    }

-

-    /**

-     * Indents the given string with the given indent.

-     *

-     * @param  string $string The string to indent

-     * @param  string $indent What to use as the indent.

-     * @return string

-     */

-    protected function indent($string, $indent = '    ')

-    {

-        return $indent.str_replace("\n", "\n".$indent, $string);

-    }

+	/**

+	 * KLogger options

+	 *  Anything options not considered 'core' to the logging library should be

+	 *  settable view the third parameter in the constructor

+	 *

+	 *  Core options include the log file path and the log threshold

+	 *

+	 * @var array

+	 */

+	protected $options = array (

+		'extension'      => 'txt',

+		'dateFormat'     => 'Y-m-d G:i:s.u',

+		'filename'       => false,

+		'flushFrequency' => false,

+		'prefix'         => 'log_',

+		'logFormat'      => false,

+		'appendContext'  => true,

+	);

+

+	/**

+	 * Path to the log file

+	 * @var string

+	 */

+	private $logFilePath;

+

+	/**

+	 * Current minimum logging threshold

+	 * @var integer

+	 */

+	protected $logLevelThreshold = LogLevel::DEBUG;

+

+	/**

+	 * The number of lines logged in this instance's lifetime

+	 * @var int

+	 */

+	private $logLineCount = 0;

+

+	/**

+	 * Log Levels

+	 * @var array

+	 */

+	protected $logLevels = array(

+		LogLevel::EMERGENCY => 0,

+		LogLevel::ALERT     => 1,

+		LogLevel::CRITICAL  => 2,

+		LogLevel::ERROR     => 3,

+		LogLevel::WARNING   => 4,

+		LogLevel::NOTICE    => 5,

+		LogLevel::INFO      => 6,

+		LogLevel::DEBUG     => 7

+	);

+

+	/**

+	 * This holds the file handle for this instance's log file

+	 * @var resource

+	 */

+	private $fileHandle;

+

+	/**

+	 * This holds the last line logged to the logger

+	 *  Used for unit tests

+	 * @var string

+	 */

+	private $lastLine = '';

+

+	/**

+	 * Octal notation for default permissions of the log file

+	 * @var integer

+	 */

+	private $defaultPermissions = 0777;

+

+	/**

+	 * Class constructor

+	 *

+	 * @param string $logDirectory      File path to the logging directory

+	 * @param string $logLevelThreshold The LogLevel Threshold

+	 * @param array  $options

+	 *

+	 * @internal param string $logFilePrefix The prefix for the log file name

+	 * @internal param string $logFileExt The extension for the log file

+	 */

+	public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array())

+	{

+		$this->logLevelThreshold = $logLevelThreshold;

+		$this->options = array_merge($this->options, $options);

+

+		$logDirectory = rtrim($logDirectory, DIRECTORY_SEPARATOR);

+		if ( ! file_exists($logDirectory)) {

+			mkdir($logDirectory, $this->defaultPermissions, true);

+		}

+

+		if(strpos($logDirectory, 'php://') === 0) {

+			$this->setLogToStdOut($logDirectory);

+			$this->setFileHandle('w+');

+		} else {

+			$this->setLogFilePath($logDirectory);

+			if(file_exists($this->logFilePath) && !is_writable($this->logFilePath)) {

+				throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

+			}

+			$this->setFileHandle('a');

+		}

+

+		if ( ! $this->fileHandle) {

+			throw new RuntimeException('The file could not be opened. Check permissions.');

+		}

+	}

+

+	/**

+	 * @param string $stdOutPath

+	 */

+	public function setLogToStdOut($stdOutPath) {

+		$this->logFilePath = $stdOutPath;

+	}

+

+	/**

+	 * @param string $logDirectory

+	 */

+	public function setLogFilePath($logDirectory) {

+		if ($this->options['filename']) {

+			if (strpos($this->options['filename'], '.log') !== false || strpos($this->options['filename'], '.txt') !== false) {

+				$this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'];

+			}

+			else {

+				$this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'].'.'.$this->options['extension'];

+			}

+		} else {

+			$this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];

+		}

+	}

+

+	/**

+	 * @param $writeMode

+	 *

+	 * @internal param resource $fileHandle

+	 */

+	public function setFileHandle($writeMode) {

+		$this->fileHandle = fopen($this->logFilePath, $writeMode);

+	}

+

+

+	/**

+	 * Class destructor

+	 */

+	public function __destruct()

+	{

+		if ($this->fileHandle) {

+			fclose($this->fileHandle);

+		}

+	}

+

+	/**

+	 * Sets the date format used by all instances of KLogger

+	 *

+	 * @param string $dateFormat Valid format string for date()

+	 */

+	public function setDateFormat($dateFormat)

+	{

+		$this->options['dateFormat'] = $dateFormat;

+	}

+

+	/**

+	 * Sets the Log Level Threshold

+	 *

+	 * @param string $logLevelThreshold The log level threshold

+	 */

+	public function setLogLevelThreshold($logLevelThreshold)

+	{

+		$this->logLevelThreshold = $logLevelThreshold;

+	}

+

+	/**

+	 * Logs with an arbitrary level.

+	 *

+	 * @param mixed $level

+	 * @param string $message

+	 * @param array $context

+	 * @return null

+	 */

+	public function log($level, $message, array $context = array())

+	{

+		if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {

+			return;

+		}

+		$message = $this->formatMessage($level, $message, $context);

+		$this->write($message);

+	}

+

+	/**

+	 * Writes a line to the log without prepending a status or timestamp

+	 *

+	 * @param string $message Line to write to the log

+	 * @return void

+	 */

+	public function write($message)

+	{

+		if (null !== $this->fileHandle) {

+			if (fwrite($this->fileHandle, $message) === false) {

+				throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

+			} else {

+				$this->lastLine = trim($message);

+				$this->logLineCount++;

+

+				if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {

+					fflush($this->fileHandle);

+				}

+			}

+		}

+	}

+

+	/**

+	 * Get the file path that the log is currently writing to

+	 *

+	 * @return string

+	 */

+	public function getLogFilePath()

+	{

+		return $this->logFilePath;

+	}

+

+	/**

+	 * Get the last line logged to the log file

+	 *

+	 * @return string

+	 */

+	public function getLastLogLine()

+	{

+		return $this->lastLine;

+	}

+

+	/**

+	 * Formats the message for logging.

+	 *

+	 * @param  string $level   The Log Level of the message

+	 * @param  string $message The message to log

+	 * @param  array  $context The context

+	 * @return string

+	 */

+	protected function formatMessage($level, $message, $context)

+	{

+		if ($this->options['logFormat']) {

+			$parts = array(

+				'date'          => $this->getTimestamp(),

+				'level'         => strtoupper($level),

+				'level-padding' => str_repeat(' ', 9 - strlen($level)),

+				'priority'      => $this->logLevels[$level],

+				'message'       => $message,

+				'context'       => json_encode($context),

+			);

+			$message = $this->options['logFormat'];

+			foreach ($parts as $part => $value) {

+				$message = str_replace('{'.$part.'}', $value, $message);

+			}

+

+		} else {

+			$message = "[{$this->getTimestamp()}] [{$level}] {$message}";

+		}

+

+		if ($this->options['appendContext'] && ! empty($context)) {

+			$message .= PHP_EOL.$this->indent($this->contextToString($context));

+		}

+

+		return $message.PHP_EOL;

+

+	}

+

+	/**

+	 * Gets the correctly formatted Date/Time for the log entry.

+	 *

+	 * PHP DateTime is dump, and you have to resort to trickery to get microseconds

+	 * to work correctly, so here it is.

+	 *

+	 * @return string

+	 */

+	private function getTimestamp()

+	{

+		$originalTime = microtime(true);

+		$micro = sprintf("%06d", ($originalTime - floor($originalTime)) * 1000000);

+		$date = new DateTime(date('Y-m-d H:i:s.'.$micro, (int)$originalTime));

+

+		return $date->format($this->options['dateFormat']);

+	}

+

+	/**

+	 * Takes the given context and coverts it to a string.

+	 *

+	 * @param  array $context The Context

+	 * @return string

+	 */

+	protected function contextToString($context)

+	{

+		$export = '';

+		foreach ($context as $key => $value) {

+			$export .= "{$key}: ";

+			$export .= preg_replace(array(

+				'/=>\s+([a-zA-Z])/im',

+				'/array\(\s+\)/im',

+				'/^  |\G  /m'

+			), array(

+				'=> $1',

+				'array()',

+				'    '

+			), str_replace('array (', 'array(', var_export($value, true)));

+			$export .= PHP_EOL;

+		}

+		return str_replace(array('\\\\', '\\\''), array('\\', '\''), rtrim($export));

+	}

+

+	/**

+	 * Indents the given string with the given indent.

+	 *

+	 * @param  string $string The string to indent

+	 * @param  string $indent What to use as the indent.

+	 * @return string

+	 */

+	protected function indent($string, $indent = '    ')

+	{

+		return $indent.str_replace("\n", "\n".$indent, $string);

+	}

 }

vendor_prefixed/illuminate/translation/FileLoader.php

Indentation +148 added lines, -148 removed lines

@@ -12,152 +12,152 @@
 
 class FileLoader implements LoaderInterface
 {
-    /**
-     * The filesystem instance.
-     *
-     * @var \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Filesystem\Filesystem
-     */
-    protected $files;
-
-    /**
-     * The default path for the loader.
-     *
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * All of the namespace hints.
-     *
-     * @var array
-     */
-    protected $hints = [];
-
-    /**
-     * Create a new file loader instance.
-     *
-     * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Filesystem\Filesystem  $files
-     * @param  string  $path
-     * @return void
-     */
-    public function __construct(Filesystem $files, $path)
-    {
-        $this->path = $path;
-        $this->files = $files;
-    }
-
-    /**
-     * Load the messages for the given locale.
-     *
-     * @param  string  $locale
-     * @param  string  $group
-     * @param  string  $namespace
-     * @return array
-     */
-    public function load($locale, $group, $namespace = null)
-    {
-        if ($group == '*' && $namespace == '*') {
-            return $this->loadJsonPath($this->path, $locale);
-        }
-
-        if (is_null($namespace) || $namespace == '*') {
-            return $this->loadPath($this->path, $locale, $group);
-        }
-
-        return $this->loadNamespaced($locale, $group, $namespace);
-    }
-
-    /**
-     * Load a namespaced translation group.
-     *
-     * @param  string  $locale
-     * @param  string  $group
-     * @param  string  $namespace
-     * @return array
-     */
-    protected function loadNamespaced($locale, $group, $namespace)
-    {
-        if (isset($this->hints[$namespace])) {
-            $lines = $this->loadPath($this->hints[$namespace], $locale, $group);
-
-            return $this->loadNamespaceOverrides($lines, $locale, $group, $namespace);
-        }
-
-        return [];
-    }
-
-    /**
-     * Load a local namespaced translation group for overrides.
-     *
-     * @param  array  $lines
-     * @param  string  $locale
-     * @param  string  $group
-     * @param  string  $namespace
-     * @return array
-     */
-    protected function loadNamespaceOverrides(array $lines, $locale, $group, $namespace)
-    {
-        $file = "{$this->path}/vendor/{$namespace}/{$locale}/{$group}.php";
-
-        if ($this->files->exists($file)) {
-            return array_replace_recursive($lines, $this->files->getRequire($file));
-        }
-
-        return $lines;
-    }
-
-    /**
-     * Load a locale from a given path.
-     *
-     * @param  string  $path
-     * @param  string  $locale
-     * @param  string  $group
-     * @return array
-     */
-    protected function loadPath($path, $locale, $group)
-    {
-        if ($this->files->exists($full = "{$path}/{$locale}/{$group}.php")) {
-            return $this->files->getRequire($full);
-        }
-
-        return [];
-    }
-
-    /**
-     * Load a locale from the given JSON file path.
-     *
-     * @param  string  $path
-     * @param  string  $locale
-     * @return array
-     */
-    protected function loadJsonPath($path, $locale)
-    {
-        if ($this->files->exists($full = "{$path}/{$locale}.json")) {
-            return json_decode($this->files->get($full), true);
-        }
-
-        return [];
-    }
-
-    /**
-     * Add a new namespace to the loader.
-     *
-     * @param  string  $namespace
-     * @param  string  $hint
-     * @return void
-     */
-    public function addNamespace($namespace, $hint)
-    {
-        $this->hints[$namespace] = $hint;
-    }
-
-    /**
-     * Get an array of all the registered namespaces.
-     *
-     * @return array
-     */
-    public function namespaces()
-    {
-        return $this->hints;
-    }
+	/**
+	 * The filesystem instance.
+	 *
+	 * @var \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Filesystem\Filesystem
+	 */
+	protected $files;
+
+	/**
+	 * The default path for the loader.
+	 *
+	 * @var string
+	 */
+	protected $path;
+
+	/**
+	 * All of the namespace hints.
+	 *
+	 * @var array
+	 */
+	protected $hints = [];
+
+	/**
+	 * Create a new file loader instance.
+	 *
+	 * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Filesystem\Filesystem  $files
+	 * @param  string  $path
+	 * @return void
+	 */
+	public function __construct(Filesystem $files, $path)
+	{
+		$this->path = $path;
+		$this->files = $files;
+	}
+
+	/**
+	 * Load the messages for the given locale.
+	 *
+	 * @param  string  $locale
+	 * @param  string  $group
+	 * @param  string  $namespace
+	 * @return array
+	 */
+	public function load($locale, $group, $namespace = null)
+	{
+		if ($group == '*' && $namespace == '*') {
+			return $this->loadJsonPath($this->path, $locale);
+		}
+
+		if (is_null($namespace) || $namespace == '*') {
+			return $this->loadPath($this->path, $locale, $group);
+		}
+
+		return $this->loadNamespaced($locale, $group, $namespace);
+	}
+
+	/**
+	 * Load a namespaced translation group.
+	 *
+	 * @param  string  $locale
+	 * @param  string  $group
+	 * @param  string  $namespace
+	 * @return array
+	 */
+	protected function loadNamespaced($locale, $group, $namespace)
+	{
+		if (isset($this->hints[$namespace])) {
+			$lines = $this->loadPath($this->hints[$namespace], $locale, $group);
+
+			return $this->loadNamespaceOverrides($lines, $locale, $group, $namespace);
+		}
+
+		return [];
+	}
+
+	/**
+	 * Load a local namespaced translation group for overrides.
+	 *
+	 * @param  array  $lines
+	 * @param  string  $locale
+	 * @param  string  $group
+	 * @param  string  $namespace
+	 * @return array
+	 */
+	protected function loadNamespaceOverrides(array $lines, $locale, $group, $namespace)
+	{
+		$file = "{$this->path}/vendor/{$namespace}/{$locale}/{$group}.php";
+
+		if ($this->files->exists($file)) {
+			return array_replace_recursive($lines, $this->files->getRequire($file));
+		}
+
+		return $lines;
+	}
+
+	/**
+	 * Load a locale from a given path.
+	 *
+	 * @param  string  $path
+	 * @param  string  $locale
+	 * @param  string  $group
+	 * @return array
+	 */
+	protected function loadPath($path, $locale, $group)
+	{
+		if ($this->files->exists($full = "{$path}/{$locale}/{$group}.php")) {
+			return $this->files->getRequire($full);
+		}
+
+		return [];
+	}
+
+	/**
+	 * Load a locale from the given JSON file path.
+	 *
+	 * @param  string  $path
+	 * @param  string  $locale
+	 * @return array
+	 */
+	protected function loadJsonPath($path, $locale)
+	{
+		if ($this->files->exists($full = "{$path}/{$locale}.json")) {
+			return json_decode($this->files->get($full), true);
+		}
+
+		return [];
+	}
+
+	/**
+	 * Add a new namespace to the loader.
+	 *
+	 * @param  string  $namespace
+	 * @param  string  $hint
+	 * @return void
+	 */
+	public function addNamespace($namespace, $hint)
+	{
+		$this->hints[$namespace] = $hint;
+	}
+
+	/**
+	 * Get an array of all the registered namespaces.
+	 *
+	 * @return array
+	 */
+	public function namespaces()
+	{
+		return $this->hints;
+	}
 }

vendor_prefixed/illuminate/translation/TranslationServiceProvider.php

Indentation +45 added lines, -45 removed lines

@@ -12,57 +12,57 @@
 
 class TranslationServiceProvider extends ServiceProvider
 {
-    /**
-     * Indicates if loading of the provider is deferred.
-     *
-     * @var bool
-     */
-    protected $defer = true;
+	/**
+	 * Indicates if loading of the provider is deferred.
+	 *
+	 * @var bool
+	 */
+	protected $defer = true;
 
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->registerLoader();
+	/**
+	 * Register the service provider.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->registerLoader();
 
-        $this->app->singleton('translator', function ($app) {
-            $loader = $app['translation.loader'];
+		$this->app->singleton('translator', function ($app) {
+			$loader = $app['translation.loader'];
 
-            // When registering the translator component, we'll need to set the default
-            // locale as well as the fallback locale. So, we'll grab the application
-            // configuration so we can easily get both of these values from there.
-            $locale = $app['config']['app.locale'];
+			// When registering the translator component, we'll need to set the default
+			// locale as well as the fallback locale. So, we'll grab the application
+			// configuration so we can easily get both of these values from there.
+			$locale = $app['config']['app.locale'];
 
-            $trans = new Translator($loader, $locale);
+			$trans = new Translator($loader, $locale);
 
-            $trans->setFallback($app['config']['app.fallback_locale']);
+			$trans->setFallback($app['config']['app.fallback_locale']);
 
-            return $trans;
-        });
-    }
+			return $trans;
+		});
+	}
 
-    /**
-     * Register the translation line loader.
-     *
-     * @return void
-     */
-    protected function registerLoader()
-    {
-        $this->app->singleton('translation.loader', function ($app) {
-            return new FileLoader($app['files'], $app['path.lang']);
-        });
-    }
+	/**
+	 * Register the translation line loader.
+	 *
+	 * @return void
+	 */
+	protected function registerLoader()
+	{
+		$this->app->singleton('translation.loader', function ($app) {
+			return new FileLoader($app['files'], $app['path.lang']);
+		});
+	}
 
-    /**
-     * Get the services provided by the provider.
-     *
-     * @return array
-     */
-    public function provides()
-    {
-        return ['translator', 'translation.loader'];
-    }
+	/**
+	 * Get the services provided by the provider.
+	 *
+	 * @return array
+	 */
+	public function provides()
+	{
+		return ['translator', 'translation.loader'];
+	}
 }

vendor_prefixed/illuminate/translation/Translator.php

Indentation +453 added lines, -453 removed lines

@@ -18,457 +18,457 @@
 
 class Translator extends NamespacedItemResolver implements TranslatorContract
 {
-    use Macroable;
-
-    /**
-     * The loader implementation.
-     *
-     * @var \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Translation\LoaderInterface
-     */
-    protected $loader;
-
-    /**
-     * The default locale being used by the translator.
-     *
-     * @var string
-     */
-    protected $locale;
-
-    /**
-     * The fallback locale used by the translator.
-     *
-     * @var string
-     */
-    protected $fallback;
-
-    /**
-     * The array of loaded translation groups.
-     *
-     * @var array
-     */
-    protected $loaded = [];
-
-    /**
-     * The message selector.
-     *
-     * @var \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Translation\MessageSelector
-     */
-    protected $selector;
-
-    /**
-     * Create a new translator instance.
-     *
-     * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Translation\LoaderInterface  $loader
-     * @param  string  $locale
-     * @return void
-     */
-    public function __construct(LoaderInterface $loader, $locale)
-    {
-        $this->loader = $loader;
-        $this->locale = $locale;
-    }
-
-    /**
-     * Determine if a translation exists for a given locale.
-     *
-     * @param  string  $key
-     * @param  string|null  $locale
-     * @return bool
-     */
-    public function hasForLocale($key, $locale = null)
-    {
-        return $this->has($key, $locale, false);
-    }
-
-    /**
-     * Determine if a translation exists.
-     *
-     * @param  string  $key
-     * @param  string|null  $locale
-     * @param  bool  $fallback
-     * @return bool
-     */
-    public function has($key, $locale = null, $fallback = true)
-    {
-        return $this->get($key, [], $locale, $fallback) !== $key;
-    }
-
-    /**
-     * Get the translation for a given key.
-     *
-     * @param  string  $key
-     * @param  array   $replace
-     * @param  string  $locale
-     * @return string|array|null
-     */
-    public function trans($key, array $replace = [], $locale = null)
-    {
-        return $this->get($key, $replace, $locale);
-    }
-
-    /**
-     * Get the translation for the given key.
-     *
-     * @param  string  $key
-     * @param  array   $replace
-     * @param  string|null  $locale
-     * @param  bool  $fallback
-     * @return string|array|null
-     */
-    public function get($key, array $replace = [], $locale = null, $fallback = true)
-    {
-        list($namespace, $group, $item) = $this->parseKey($key);
-
-        // Here we will get the locale that should be used for the language line. If one
-        // was not passed, we will use the default locales which was given to us when
-        // the translator was instantiated. Then, we can load the lines and return.
-        $locales = $fallback ? $this->localeArray($locale)
-                             : [$locale ?: $this->locale];
-
-        foreach ($locales as $locale) {
-            if (! is_null($line = $this->getLine(
-                $namespace, $group, $locale, $item, $replace
-            ))) {
-                break;
-            }
-        }
-
-        // If the line doesn't exist, we will return back the key which was requested as
-        // that will be quick to spot in the UI if language keys are wrong or missing
-        // from the application's language files. Otherwise we can return the line.
-        if (isset($line)) {
-            return $line;
-        }
-
-        return $key;
-    }
-
-    /**
-     * Get the translation for a given key from the JSON translation files.
-     *
-     * @param  string  $key
-     * @param  array  $replace
-     * @param  string  $locale
-     * @return string
-     */
-    public function getFromJson($key, array $replace = [], $locale = null)
-    {
-        $locale = $locale ?: $this->locale;
-
-        // For JSON translations, there is only one file per locale, so we will simply load
-        // that file and then we will be ready to check the array for the key. These are
-        // only one level deep so we do not need to do any fancy searching through it.
-        $this->load('*', '*', $locale);
-
-        $line = isset($this->loaded['*']['*'][$locale][$key])
-                    ? $this->loaded['*']['*'][$locale][$key] : null;
-
-        // If we can't find a translation for the JSON key, we will attempt to translate it
-        // using the typical translation file. This way developers can always just use a
-        // helper such as __ instead of having to pick between trans or __ with views.
-        if (! isset($line)) {
-            $fallback = $this->get($key, $replace, $locale);
-
-            if ($fallback !== $key) {
-                return $fallback;
-            }
-        }
-
-        return $this->makeReplacements($line ?: $key, $replace);
-    }
-
-    /**
-     * Get a translation according to an integer value.
-     *
-     * @param  string  $key
-     * @param  int|array|\Countable  $number
-     * @param  array   $replace
-     * @param  string  $locale
-     * @return string
-     */
-    public function transChoice($key, $number, array $replace = [], $locale = null)
-    {
-        return $this->choice($key, $number, $replace, $locale);
-    }
-
-    /**
-     * Get a translation according to an integer value.
-     *
-     * @param  string  $key
-     * @param  int|array|\Countable  $number
-     * @param  array   $replace
-     * @param  string  $locale
-     * @return string
-     */
-    public function choice($key, $number, array $replace = [], $locale = null)
-    {
-        $line = $this->get(
-            $key, $replace, $locale = $this->localeForChoice($locale)
-        );
-
-        // If the given "number" is actually an array or countable we will simply count the
-        // number of elements in an instance. This allows developers to pass an array of
-        // items without having to count it on their end first which gives bad syntax.
-        if (is_array($number) || $number instanceof Countable) {
-            $number = count($number);
-        }
-
-        $replace['count'] = $number;
-
-        return $this->makeReplacements(
-            $this->getSelector()->choose($line, $number, $locale), $replace
-        );
-    }
-
-    /**
-     * Get the proper locale for a choice operation.
-     *
-     * @param  string|null  $locale
-     * @return string
-     */
-    protected function localeForChoice($locale)
-    {
-        return $locale ?: $this->locale ?: $this->fallback;
-    }
-
-    /**
-     * Retrieve a language line out the loaded array.
-     *
-     * @param  string  $namespace
-     * @param  string  $group
-     * @param  string  $locale
-     * @param  string  $item
-     * @param  array   $replace
-     * @return string|array|null
-     */
-    protected function getLine($namespace, $group, $locale, $item, array $replace)
-    {
-        $this->load($namespace, $group, $locale);
-
-        $line = Arr::get($this->loaded[$namespace][$group][$locale], $item);
-
-        if (is_string($line)) {
-            return $this->makeReplacements($line, $replace);
-        } elseif (is_array($line) && count($line) > 0) {
-            return $line;
-        }
-    }
-
-    /**
-     * Make the place-holder replacements on a line.
-     *
-     * @param  string  $line
-     * @param  array   $replace
-     * @return string
-     */
-    protected function makeReplacements($line, array $replace)
-    {
-        if (empty($replace)) {
-            return $line;
-        }
-
-        $replace = $this->sortReplacements($replace);
-
-        foreach ($replace as $key => $value) {
-            $line = str_replace(
-                [':'.$key, ':'.Str::upper($key), ':'.Str::ucfirst($key)],
-                [$value, Str::upper($value), Str::ucfirst($value)],
-                $line
-            );
-        }
-
-        return $line;
-    }
-
-    /**
-     * Sort the replacements array.
-     *
-     * @param  array  $replace
-     * @return array
-     */
-    protected function sortReplacements(array $replace)
-    {
-        return (new Collection($replace))->sortBy(function ($value, $key) {
-            return mb_strlen($key) * -1;
-        })->all();
-    }
-
-    /**
-     * Add translation lines to the given locale.
-     *
-     * @param  array  $lines
-     * @param  string  $locale
-     * @param  string  $namespace
-     * @return void
-     */
-    public function addLines(array $lines, $locale, $namespace = '*')
-    {
-        foreach ($lines as $key => $value) {
-            list($group, $item) = explode('.', $key, 2);
-
-            Arr::set($this->loaded, "$namespace.$group.$locale.$item", $value);
-        }
-    }
-
-    /**
-     * Load the specified language group.
-     *
-     * @param  string  $namespace
-     * @param  string  $group
-     * @param  string  $locale
-     * @return void
-     */
-    public function load($namespace, $group, $locale)
-    {
-        if ($this->isLoaded($namespace, $group, $locale)) {
-            return;
-        }
-
-        // The loader is responsible for returning the array of language lines for the
-        // given namespace, group, and locale. We'll set the lines in this array of
-        // lines that have already been loaded so that we can easily access them.
-        $lines = $this->loader->load($locale, $group, $namespace);
-
-        $this->loaded[$namespace][$group][$locale] = $lines;
-    }
-
-    /**
-     * Determine if the given group has been loaded.
-     *
-     * @param  string  $namespace
-     * @param  string  $group
-     * @param  string  $locale
-     * @return bool
-     */
-    protected function isLoaded($namespace, $group, $locale)
-    {
-        return isset($this->loaded[$namespace][$group][$locale]);
-    }
-
-    /**
-     * Add a new namespace to the loader.
-     *
-     * @param  string  $namespace
-     * @param  string  $hint
-     * @return void
-     */
-    public function addNamespace($namespace, $hint)
-    {
-        $this->loader->addNamespace($namespace, $hint);
-    }
-
-    /**
-     * Parse a key into namespace, group, and item.
-     *
-     * @param  string  $key
-     * @return array
-     */
-    public function parseKey($key)
-    {
-        $segments = parent::parseKey($key);
-
-        if (is_null($segments[0])) {
-            $segments[0] = '*';
-        }
-
-        return $segments;
-    }
-
-    /**
-     * Get the array of locales to be checked.
-     *
-     * @param  string|null  $locale
-     * @return array
-     */
-    protected function localeArray($locale)
-    {
-        return array_filter([$locale ?: $this->locale, $this->fallback]);
-    }
-
-    /**
-     * Get the message selector instance.
-     *
-     * @return \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Translation\MessageSelector
-     */
-    public function getSelector()
-    {
-        if (! isset($this->selector)) {
-            $this->selector = new MessageSelector;
-        }
-
-        return $this->selector;
-    }
-
-    /**
-     * Set the message selector instance.
-     *
-     * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Translation\MessageSelector  $selector
-     * @return void
-     */
-    public function setSelector(MessageSelector $selector)
-    {
-        $this->selector = $selector;
-    }
-
-    /**
-     * Get the language line loader implementation.
-     *
-     * @return \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Translation\LoaderInterface
-     */
-    public function getLoader()
-    {
-        return $this->loader;
-    }
-
-    /**
-     * Get the default locale being used.
-     *
-     * @return string
-     */
-    public function locale()
-    {
-        return $this->getLocale();
-    }
-
-    /**
-     * Get the default locale being used.
-     *
-     * @return string
-     */
-    public function getLocale()
-    {
-        return $this->locale;
-    }
-
-    /**
-     * Set the default locale.
-     *
-     * @param  string  $locale
-     * @return void
-     */
-    public function setLocale($locale)
-    {
-        $this->locale = $locale;
-    }
-
-    /**
-     * Get the fallback locale being used.
-     *
-     * @return string
-     */
-    public function getFallback()
-    {
-        return $this->fallback;
-    }
-
-    /**
-     * Set the fallback locale being used.
-     *
-     * @param  string  $fallback
-     * @return void
-     */
-    public function setFallback($fallback)
-    {
-        $this->fallback = $fallback;
-    }
+	use Macroable;
+
+	/**
+	 * The loader implementation.
+	 *
+	 * @var \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Translation\LoaderInterface
+	 */
+	protected $loader;
+
+	/**
+	 * The default locale being used by the translator.
+	 *
+	 * @var string
+	 */
+	protected $locale;
+
+	/**
+	 * The fallback locale used by the translator.
+	 *
+	 * @var string
+	 */
+	protected $fallback;
+
+	/**
+	 * The array of loaded translation groups.
+	 *
+	 * @var array
+	 */
+	protected $loaded = [];
+
+	/**
+	 * The message selector.
+	 *
+	 * @var \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Translation\MessageSelector
+	 */
+	protected $selector;
+
+	/**
+	 * Create a new translator instance.
+	 *
+	 * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Translation\LoaderInterface  $loader
+	 * @param  string  $locale
+	 * @return void
+	 */
+	public function __construct(LoaderInterface $loader, $locale)
+	{
+		$this->loader = $loader;
+		$this->locale = $locale;
+	}
+
+	/**
+	 * Determine if a translation exists for a given locale.
+	 *
+	 * @param  string  $key
+	 * @param  string|null  $locale
+	 * @return bool
+	 */
+	public function hasForLocale($key, $locale = null)
+	{
+		return $this->has($key, $locale, false);
+	}
+
+	/**
+	 * Determine if a translation exists.
+	 *
+	 * @param  string  $key
+	 * @param  string|null  $locale
+	 * @param  bool  $fallback
+	 * @return bool
+	 */
+	public function has($key, $locale = null, $fallback = true)
+	{
+		return $this->get($key, [], $locale, $fallback) !== $key;
+	}
+
+	/**
+	 * Get the translation for a given key.
+	 *
+	 * @param  string  $key
+	 * @param  array   $replace
+	 * @param  string  $locale
+	 * @return string|array|null
+	 */
+	public function trans($key, array $replace = [], $locale = null)
+	{
+		return $this->get($key, $replace, $locale);
+	}
+
+	/**
+	 * Get the translation for the given key.
+	 *
+	 * @param  string  $key
+	 * @param  array   $replace
+	 * @param  string|null  $locale
+	 * @param  bool  $fallback
+	 * @return string|array|null
+	 */
+	public function get($key, array $replace = [], $locale = null, $fallback = true)
+	{
+		list($namespace, $group, $item) = $this->parseKey($key);
+
+		// Here we will get the locale that should be used for the language line. If one
+		// was not passed, we will use the default locales which was given to us when
+		// the translator was instantiated. Then, we can load the lines and return.
+		$locales = $fallback ? $this->localeArray($locale)
+							 : [$locale ?: $this->locale];
+
+		foreach ($locales as $locale) {
+			if (! is_null($line = $this->getLine(
+				$namespace, $group, $locale, $item, $replace
+			))) {
+				break;
+			}
+		}
+
+		// If the line doesn't exist, we will return back the key which was requested as
+		// that will be quick to spot in the UI if language keys are wrong or missing
+		// from the application's language files. Otherwise we can return the line.
+		if (isset($line)) {
+			return $line;
+		}
+
+		return $key;
+	}
+
+	/**
+	 * Get the translation for a given key from the JSON translation files.
+	 *
+	 * @param  string  $key
+	 * @param  array  $replace
+	 * @param  string  $locale
+	 * @return string
+	 */
+	public function getFromJson($key, array $replace = [], $locale = null)
+	{
+		$locale = $locale ?: $this->locale;
+
+		// For JSON translations, there is only one file per locale, so we will simply load
+		// that file and then we will be ready to check the array for the key. These are
+		// only one level deep so we do not need to do any fancy searching through it.
+		$this->load('*', '*', $locale);
+
+		$line = isset($this->loaded['*']['*'][$locale][$key])
+					? $this->loaded['*']['*'][$locale][$key] : null;
+
+		// If we can't find a translation for the JSON key, we will attempt to translate it
+		// using the typical translation file. This way developers can always just use a
+		// helper such as __ instead of having to pick between trans or __ with views.
+		if (! isset($line)) {
+			$fallback = $this->get($key, $replace, $locale);
+
+			if ($fallback !== $key) {
+				return $fallback;
+			}
+		}
+
+		return $this->makeReplacements($line ?: $key, $replace);
+	}
+
+	/**
+	 * Get a translation according to an integer value.
+	 *
+	 * @param  string  $key
+	 * @param  int|array|\Countable  $number
+	 * @param  array   $replace
+	 * @param  string  $locale
+	 * @return string
+	 */
+	public function transChoice($key, $number, array $replace = [], $locale = null)
+	{
+		return $this->choice($key, $number, $replace, $locale);
+	}
+
+	/**
+	 * Get a translation according to an integer value.
+	 *
+	 * @param  string  $key
+	 * @param  int|array|\Countable  $number
+	 * @param  array   $replace
+	 * @param  string  $locale
+	 * @return string
+	 */
+	public function choice($key, $number, array $replace = [], $locale = null)
+	{
+		$line = $this->get(
+			$key, $replace, $locale = $this->localeForChoice($locale)
+		);
+
+		// If the given "number" is actually an array or countable we will simply count the
+		// number of elements in an instance. This allows developers to pass an array of
+		// items without having to count it on their end first which gives bad syntax.
+		if (is_array($number) || $number instanceof Countable) {
+			$number = count($number);
+		}
+
+		$replace['count'] = $number;
+
+		return $this->makeReplacements(
+			$this->getSelector()->choose($line, $number, $locale), $replace
+		);
+	}
+
+	/**
+	 * Get the proper locale for a choice operation.
+	 *
+	 * @param  string|null  $locale
+	 * @return string
+	 */
+	protected function localeForChoice($locale)
+	{
+		return $locale ?: $this->locale ?: $this->fallback;
+	}
+
+	/**
+	 * Retrieve a language line out the loaded array.
+	 *
+	 * @param  string  $namespace
+	 * @param  string  $group
+	 * @param  string  $locale
+	 * @param  string  $item
+	 * @param  array   $replace
+	 * @return string|array|null
+	 */
+	protected function getLine($namespace, $group, $locale, $item, array $replace)
+	{
+		$this->load($namespace, $group, $locale);
+
+		$line = Arr::get($this->loaded[$namespace][$group][$locale], $item);
+
+		if (is_string($line)) {
+			return $this->makeReplacements($line, $replace);
+		} elseif (is_array($line) && count($line) > 0) {
+			return $line;
+		}
+	}
+
+	/**
+	 * Make the place-holder replacements on a line.
+	 *
+	 * @param  string  $line
+	 * @param  array   $replace
+	 * @return string
+	 */
+	protected function makeReplacements($line, array $replace)
+	{
+		if (empty($replace)) {
+			return $line;
+		}
+
+		$replace = $this->sortReplacements($replace);
+
+		foreach ($replace as $key => $value) {
+			$line = str_replace(
+				[':'.$key, ':'.Str::upper($key), ':'.Str::ucfirst($key)],
+				[$value, Str::upper($value), Str::ucfirst($value)],
+				$line
+			);
+		}
+
+		return $line;
+	}
+
+	/**
+	 * Sort the replacements array.
+	 *
+	 * @param  array  $replace
+	 * @return array
+	 */
+	protected function sortReplacements(array $replace)
+	{
+		return (new Collection($replace))->sortBy(function ($value, $key) {
+			return mb_strlen($key) * -1;
+		})->all();
+	}
+
+	/**
+	 * Add translation lines to the given locale.
+	 *
+	 * @param  array  $lines
+	 * @param  string  $locale
+	 * @param  string  $namespace
+	 * @return void
+	 */
+	public function addLines(array $lines, $locale, $namespace = '*')
+	{
+		foreach ($lines as $key => $value) {
+			list($group, $item) = explode('.', $key, 2);
+
+			Arr::set($this->loaded, "$namespace.$group.$locale.$item", $value);
+		}
+	}
+
+	/**
+	 * Load the specified language group.
+	 *
+	 * @param  string  $namespace
+	 * @param  string  $group
+	 * @param  string  $locale
+	 * @return void
+	 */
+	public function load($namespace, $group, $locale)
+	{
+		if ($this->isLoaded($namespace, $group, $locale)) {
+			return;
+		}
+
+		// The loader is responsible for returning the array of language lines for the
+		// given namespace, group, and locale. We'll set the lines in this array of
+		// lines that have already been loaded so that we can easily access them.
+		$lines = $this->loader->load($locale, $group, $namespace);
+
+		$this->loaded[$namespace][$group][$locale] = $lines;
+	}
+
+	/**
+	 * Determine if the given group has been loaded.
+	 *
+	 * @param  string  $namespace
+	 * @param  string  $group
+	 * @param  string  $locale
+	 * @return bool
+	 */
+	protected function isLoaded($namespace, $group, $locale)
+	{
+		return isset($this->loaded[$namespace][$group][$locale]);
+	}
+
+	/**
+	 * Add a new namespace to the loader.
+	 *
+	 * @param  string  $namespace
+	 * @param  string  $hint
+	 * @return void
+	 */
+	public function addNamespace($namespace, $hint)
+	{
+		$this->loader->addNamespace($namespace, $hint);
+	}
+
+	/**
+	 * Parse a key into namespace, group, and item.
+	 *
+	 * @param  string  $key
+	 * @return array
+	 */
+	public function parseKey($key)
+	{
+		$segments = parent::parseKey($key);
+
+		if (is_null($segments[0])) {
+			$segments[0] = '*';
+		}
+
+		return $segments;
+	}
+
+	/**
+	 * Get the array of locales to be checked.
+	 *
+	 * @param  string|null  $locale
+	 * @return array
+	 */
+	protected function localeArray($locale)
+	{
+		return array_filter([$locale ?: $this->locale, $this->fallback]);
+	}
+
+	/**
+	 * Get the message selector instance.
+	 *
+	 * @return \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Translation\MessageSelector
+	 */
+	public function getSelector()
+	{
+		if (! isset($this->selector)) {
+			$this->selector = new MessageSelector;
+		}
+
+		return $this->selector;
+	}
+
+	/**
+	 * Set the message selector instance.
+	 *
+	 * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Translation\MessageSelector  $selector
+	 * @return void
+	 */
+	public function setSelector(MessageSelector $selector)
+	{
+		$this->selector = $selector;
+	}
+
+	/**
+	 * Get the language line loader implementation.
+	 *
+	 * @return \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Translation\LoaderInterface
+	 */
+	public function getLoader()
+	{
+		return $this->loader;
+	}
+
+	/**
+	 * Get the default locale being used.
+	 *
+	 * @return string
+	 */
+	public function locale()
+	{
+		return $this->getLocale();
+	}
+
+	/**
+	 * Get the default locale being used.
+	 *
+	 * @return string
+	 */
+	public function getLocale()
+	{
+		return $this->locale;
+	}
+
+	/**
+	 * Set the default locale.
+	 *
+	 * @param  string  $locale
+	 * @return void
+	 */
+	public function setLocale($locale)
+	{
+		$this->locale = $locale;
+	}
+
+	/**
+	 * Get the fallback locale being used.
+	 *
+	 * @return string
+	 */
+	public function getFallback()
+	{
+		return $this->fallback;
+	}
+
+	/**
+	 * Set the fallback locale being used.
+	 *
+	 * @param  string  $fallback
+	 * @return void
+	 */
+	public function setFallback($fallback)
+	{
+		$this->fallback = $fallback;
+	}
 }

vendor_prefixed/illuminate/translation/MessageSelector.php

Indentation +388 added lines, -388 removed lines

@@ -12,407 +12,407 @@
 
 class MessageSelector
 {
-    /**
-     * Select a proper translation string based on the given number.
-     *
-     * @param  string  $line
-     * @param  int  $number
-     * @param  string  $locale
-     * @return mixed
-     */
-    public function choose($line, $number, $locale)
-    {
-        $segments = explode('|', $line);
+	/**
+	 * Select a proper translation string based on the given number.
+	 *
+	 * @param  string  $line
+	 * @param  int  $number
+	 * @param  string  $locale
+	 * @return mixed
+	 */
+	public function choose($line, $number, $locale)
+	{
+		$segments = explode('|', $line);
 
-        if (($value = $this->extract($segments, $number)) !== null) {
-            return trim($value);
-        }
+		if (($value = $this->extract($segments, $number)) !== null) {
+			return trim($value);
+		}
 
-        $segments = $this->stripConditions($segments);
+		$segments = $this->stripConditions($segments);
 
-        $pluralIndex = $this->getPluralIndex($locale, $number);
+		$pluralIndex = $this->getPluralIndex($locale, $number);
 
-        if (count($segments) == 1 || ! isset($segments[$pluralIndex])) {
-            return $segments[0];
-        }
+		if (count($segments) == 1 || ! isset($segments[$pluralIndex])) {
+			return $segments[0];
+		}
 
-        return $segments[$pluralIndex];
-    }
+		return $segments[$pluralIndex];
+	}
 
-    /**
-     * Extract a translation string using inline conditions.
-     *
-     * @param  array  $segments
-     * @param  int  $number
-     * @return mixed
-     */
-    private function extract($segments, $number)
-    {
-        foreach ($segments as $part) {
-            if (! is_null($line = $this->extractFromString($part, $number))) {
-                return $line;
-            }
-        }
-    }
+	/**
+	 * Extract a translation string using inline conditions.
+	 *
+	 * @param  array  $segments
+	 * @param  int  $number
+	 * @return mixed
+	 */
+	private function extract($segments, $number)
+	{
+		foreach ($segments as $part) {
+			if (! is_null($line = $this->extractFromString($part, $number))) {
+				return $line;
+			}
+		}
+	}
 
-    /**
-     * Get the translation string if the condition matches.
-     *
-     * @param  string  $part
-     * @param  int  $number
-     * @return mixed
-     */
-    private function extractFromString($part, $number)
-    {
-        preg_match('/^[\{\[]([^\[\]\{\}]*)[\}\]](.*)/s', $part, $matches);
+	/**
+	 * Get the translation string if the condition matches.
+	 *
+	 * @param  string  $part
+	 * @param  int  $number
+	 * @return mixed
+	 */
+	private function extractFromString($part, $number)
+	{
+		preg_match('/^[\{\[]([^\[\]\{\}]*)[\}\]](.*)/s', $part, $matches);
 
-        if (count($matches) != 3) {
-            return;
-        }
+		if (count($matches) != 3) {
+			return;
+		}
 
-        $condition = $matches[1];
+		$condition = $matches[1];
 
-        $value = $matches[2];
+		$value = $matches[2];
 
-        if (Str::contains($condition, ',')) {
-            list($from, $to) = explode(',', $condition, 2);
+		if (Str::contains($condition, ',')) {
+			list($from, $to) = explode(',', $condition, 2);
 
-            if ($to == '*' && $number >= $from) {
-                return $value;
-            } elseif ($from == '*' && $number <= $to) {
-                return $value;
-            } elseif ($number >= $from && $number <= $to) {
-                return $value;
-            }
-        }
+			if ($to == '*' && $number >= $from) {
+				return $value;
+			} elseif ($from == '*' && $number <= $to) {
+				return $value;
+			} elseif ($number >= $from && $number <= $to) {
+				return $value;
+			}
+		}
 
-        return $condition == $number ? $value : null;
-    }
+		return $condition == $number ? $value : null;
+	}
 
-    /**
-     * Strip the inline conditions from each segment, just leaving the text.
-     *
-     * @param  array  $segments
-     * @return array
-     */
-    private function stripConditions($segments)
-    {
-        return collect($segments)->map(function ($part) {
-            return preg_replace('/^[\{\[]([^\[\]\{\}]*)[\}\]]/', '', $part);
-        })->all();
-    }
+	/**
+	 * Strip the inline conditions from each segment, just leaving the text.
+	 *
+	 * @param  array  $segments
+	 * @return array
+	 */
+	private function stripConditions($segments)
+	{
+		return collect($segments)->map(function ($part) {
+			return preg_replace('/^[\{\[]([^\[\]\{\}]*)[\}\]]/', '', $part);
+		})->all();
+	}
 
-    /**
-     * Get the index to use for pluralization.
-     *
-     * The plural rules are derived from code of the Zend Framework (2010-09-25), which
-     * is subject to the new BSD license (http://framework.zend.com/license/new-bsd)
-     * Copyright (c) 2005-2010 - Zend Technologies USA Inc. (http://www.zend.com)
-     *
-     * @param  string  $locale
-     * @param  int  $number
-     * @return int
-     */
-    public function getPluralIndex($locale, $number)
-    {
-        switch ($locale) {
-            case 'az':
-            case 'az_AZ':
-            case 'bo':
-            case 'bo_CN':
-            case 'bo_IN':
-            case 'dz':
-            case 'dz_BT':
-            case 'id':
-            case 'id_ID':
-            case 'ja':
-            case 'ja_JP':
-            case 'jv':
-            case 'ka':
-            case 'ka_GE':
-            case 'km':
-            case 'km_KH':
-            case 'kn':
-            case 'kn_IN':
-            case 'ko':
-            case 'ko_KR':
-            case 'ms':
-            case 'ms_MY':
-            case 'th':
-            case 'th_TH':
-            case 'tr':
-            case 'tr_CY':
-            case 'tr_TR':
-            case 'vi':
-            case 'vi_VN':
-            case 'zh':
-            case 'zh_CN':
-            case 'zh_HK':
-            case 'zh_SG':
-            case 'zh_TW':
-                return 0;
-            case 'af':
-            case 'af_ZA':
-            case 'bn':
-            case 'bn_BD':
-            case 'bn_IN':
-            case 'bg':
-            case 'bg_BG':
-            case 'ca':
-            case 'ca_AD':
-            case 'ca_ES':
-            case 'ca_FR':
-            case 'ca_IT':
-            case 'da':
-            case 'da_DK':
-            case 'de':
-            case 'de_AT':
-            case 'de_BE':
-            case 'de_CH':
-            case 'de_DE':
-            case 'de_LI':
-            case 'de_LU':
-            case 'el':
-            case 'el_CY':
-            case 'el_GR':
-            case 'en':
-            case 'en_AG':
-            case 'en_AU':
-            case 'en_BW':
-            case 'en_CA':
-            case 'en_DK':
-            case 'en_GB':
-            case 'en_HK':
-            case 'en_IE':
-            case 'en_IN':
-            case 'en_NG':
-            case 'en_NZ':
-            case 'en_PH':
-            case 'en_SG':
-            case 'en_US':
-            case 'en_ZA':
-            case 'en_ZM':
-            case 'en_ZW':
-            case 'eo':
-            case 'eo_US':
-            case 'es':
-            case 'es_AR':
-            case 'es_BO':
-            case 'es_CL':
-            case 'es_CO':
-            case 'es_CR':
-            case 'es_CU':
-            case 'es_DO':
-            case 'es_EC':
-            case 'es_ES':
-            case 'es_GT':
-            case 'es_HN':
-            case 'es_MX':
-            case 'es_NI':
-            case 'es_PA':
-            case 'es_PE':
-            case 'es_PR':
-            case 'es_PY':
-            case 'es_SV':
-            case 'es_US':
-            case 'es_UY':
-            case 'es_VE':
-            case 'et':
-            case 'et_EE':
-            case 'eu':
-            case 'eu_ES':
-            case 'eu_FR':
-            case 'fa':
-            case 'fa_IR':
-            case 'fi':
-            case 'fi_FI':
-            case 'fo':
-            case 'fo_FO':
-            case 'fur':
-            case 'fur_IT':
-            case 'fy':
-            case 'fy_DE':
-            case 'fy_NL':
-            case 'gl':
-            case 'gl_ES':
-            case 'gu':
-            case 'gu_IN':
-            case 'ha':
-            case 'ha_NG':
-            case 'he':
-            case 'he_IL':
-            case 'hu':
-            case 'hu_HU':
-            case 'is':
-            case 'is_IS':
-            case 'it':
-            case 'it_CH':
-            case 'it_IT':
-            case 'ku':
-            case 'ku_TR':
-            case 'lb':
-            case 'lb_LU':
-            case 'ml':
-            case 'ml_IN':
-            case 'mn':
-            case 'mn_MN':
-            case 'mr':
-            case 'mr_IN':
-            case 'nah':
-            case 'nb':
-            case 'nb_NO':
-            case 'ne':
-            case 'ne_NP':
-            case 'nl':
-            case 'nl_AW':
-            case 'nl_BE':
-            case 'nl_NL':
-            case 'nn':
-            case 'nn_NO':
-            case 'no':
-            case 'om':
-            case 'om_ET':
-            case 'om_KE':
-            case 'or':
-            case 'or_IN':
-            case 'pa':
-            case 'pa_IN':
-            case 'pa_PK':
-            case 'pap':
-            case 'pap_AN':
-            case 'pap_AW':
-            case 'pap_CW':
-            case 'ps':
-            case 'ps_AF':
-            case 'pt':
-            case 'pt_BR':
-            case 'pt_PT':
-            case 'so':
-            case 'so_DJ':
-            case 'so_ET':
-            case 'so_KE':
-            case 'so_SO':
-            case 'sq':
-            case 'sq_AL':
-            case 'sq_MK':
-            case 'sv':
-            case 'sv_FI':
-            case 'sv_SE':
-            case 'sw':
-            case 'sw_KE':
-            case 'sw_TZ':
-            case 'ta':
-            case 'ta_IN':
-            case 'ta_LK':
-            case 'te':
-            case 'te_IN':
-            case 'tk':
-            case 'tk_TM':
-            case 'ur':
-            case 'ur_IN':
-            case 'ur_PK':
-            case 'zu':
-            case 'zu_ZA':
-                return ($number == 1) ? 0 : 1;
-            case 'am':
-            case 'am_ET':
-            case 'bh':
-            case 'fil':
-            case 'fil_PH':
-            case 'fr':
-            case 'fr_BE':
-            case 'fr_CA':
-            case 'fr_CH':
-            case 'fr_FR':
-            case 'fr_LU':
-            case 'gun':
-            case 'hi':
-            case 'hi_IN':
-            case 'hy':
-            case 'hy_AM':
-            case 'ln':
-            case 'ln_CD':
-            case 'mg':
-            case 'mg_MG':
-            case 'nso':
-            case 'nso_ZA':
-            case 'ti':
-            case 'ti_ER':
-            case 'ti_ET':
-            case 'wa':
-            case 'wa_BE':
-            case 'xbr':
-                return (($number == 0) || ($number == 1)) ? 0 : 1;
-            case 'be':
-            case 'be_BY':
-            case 'bs':
-            case 'bs_BA':
-            case 'hr':
-            case 'hr_HR':
-            case 'ru':
-            case 'ru_RU':
-            case 'ru_UA':
-            case 'sr':
-            case 'sr_ME':
-            case 'sr_RS':
-            case 'uk':
-            case 'uk_UA':
-                return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
-            case 'cs':
-            case 'cs_CZ':
-            case 'sk':
-            case 'sk_SK':
-                return ($number == 1) ? 0 : ((($number >= 2) && ($number <= 4)) ? 1 : 2);
-            case 'ga':
-            case 'ga_IE':
-                return ($number == 1) ? 0 : (($number == 2) ? 1 : 2);
-            case 'lt':
-            case 'lt_LT':
-                return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
-            case 'sl':
-            case 'sl_SI':
-                return ($number % 100 == 1) ? 0 : (($number % 100 == 2) ? 1 : ((($number % 100 == 3) || ($number % 100 == 4)) ? 2 : 3));
-            case 'mk':
-            case 'mk_MK':
-                return ($number % 10 == 1) ? 0 : 1;
-            case 'mt':
-            case 'mt_MT':
-                return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 1) && ($number % 100 < 11))) ? 1 : ((($number % 100 > 10) && ($number % 100 < 20)) ? 2 : 3));
-            case 'lv':
-            case 'lv_LV':
-                return ($number == 0) ? 0 : ((($number % 10 == 1) && ($number % 100 != 11)) ? 1 : 2);
-            case 'pl':
-            case 'pl_PL':
-                return ($number == 1) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 12) || ($number % 100 > 14))) ? 1 : 2);
-            case 'cy':
-            case 'cy_GB':
-                return ($number == 1) ? 0 : (($number == 2) ? 1 : ((($number == 8) || ($number == 11)) ? 2 : 3));
-            case 'ro':
-            case 'ro_RO':
-                return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2);
-            case 'ar':
-            case 'ar_AE':
-            case 'ar_BH':
-            case 'ar_DZ':
-            case 'ar_EG':
-            case 'ar_IN':
-            case 'ar_IQ':
-            case 'ar_JO':
-            case 'ar_KW':
-            case 'ar_LB':
-            case 'ar_LY':
-            case 'ar_MA':
-            case 'ar_OM':
-            case 'ar_QA':
-            case 'ar_SA':
-            case 'ar_SD':
-            case 'ar_SS':
-            case 'ar_SY':
-            case 'ar_TN':
-            case 'ar_YE':
-                return ($number == 0) ? 0 : (($number == 1) ? 1 : (($number == 2) ? 2 : ((($number % 100 >= 3) && ($number % 100 <= 10)) ? 3 : ((($number % 100 >= 11) && ($number % 100 <= 99)) ? 4 : 5))));
-            default:
-                return 0;
-        }
-    }
+	/**
+	 * Get the index to use for pluralization.
+	 *
+	 * The plural rules are derived from code of the Zend Framework (2010-09-25), which
+	 * is subject to the new BSD license (http://framework.zend.com/license/new-bsd)
+	 * Copyright (c) 2005-2010 - Zend Technologies USA Inc. (http://www.zend.com)
+	 *
+	 * @param  string  $locale
+	 * @param  int  $number
+	 * @return int
+	 */
+	public function getPluralIndex($locale, $number)
+	{
+		switch ($locale) {
+			case 'az':
+			case 'az_AZ':
+			case 'bo':
+			case 'bo_CN':
+			case 'bo_IN':
+			case 'dz':
+			case 'dz_BT':
+			case 'id':
+			case 'id_ID':
+			case 'ja':
+			case 'ja_JP':
+			case 'jv':
+			case 'ka':
+			case 'ka_GE':
+			case 'km':
+			case 'km_KH':
+			case 'kn':
+			case 'kn_IN':
+			case 'ko':
+			case 'ko_KR':
+			case 'ms':
+			case 'ms_MY':
+			case 'th':
+			case 'th_TH':
+			case 'tr':
+			case 'tr_CY':
+			case 'tr_TR':
+			case 'vi':
+			case 'vi_VN':
+			case 'zh':
+			case 'zh_CN':
+			case 'zh_HK':
+			case 'zh_SG':
+			case 'zh_TW':
+				return 0;
+			case 'af':
+			case 'af_ZA':
+			case 'bn':
+			case 'bn_BD':
+			case 'bn_IN':
+			case 'bg':
+			case 'bg_BG':
+			case 'ca':
+			case 'ca_AD':
+			case 'ca_ES':
+			case 'ca_FR':
+			case 'ca_IT':
+			case 'da':
+			case 'da_DK':
+			case 'de':
+			case 'de_AT':
+			case 'de_BE':
+			case 'de_CH':
+			case 'de_DE':
+			case 'de_LI':
+			case 'de_LU':
+			case 'el':
+			case 'el_CY':
+			case 'el_GR':
+			case 'en':
+			case 'en_AG':
+			case 'en_AU':
+			case 'en_BW':
+			case 'en_CA':
+			case 'en_DK':
+			case 'en_GB':
+			case 'en_HK':
+			case 'en_IE':
+			case 'en_IN':
+			case 'en_NG':
+			case 'en_NZ':
+			case 'en_PH':
+			case 'en_SG':
+			case 'en_US':
+			case 'en_ZA':
+			case 'en_ZM':
+			case 'en_ZW':
+			case 'eo':
+			case 'eo_US':
+			case 'es':
+			case 'es_AR':
+			case 'es_BO':
+			case 'es_CL':
+			case 'es_CO':
+			case 'es_CR':
+			case 'es_CU':
+			case 'es_DO':
+			case 'es_EC':
+			case 'es_ES':
+			case 'es_GT':
+			case 'es_HN':
+			case 'es_MX':
+			case 'es_NI':
+			case 'es_PA':
+			case 'es_PE':
+			case 'es_PR':
+			case 'es_PY':
+			case 'es_SV':
+			case 'es_US':
+			case 'es_UY':
+			case 'es_VE':
+			case 'et':
+			case 'et_EE':
+			case 'eu':
+			case 'eu_ES':
+			case 'eu_FR':
+			case 'fa':
+			case 'fa_IR':
+			case 'fi':
+			case 'fi_FI':
+			case 'fo':
+			case 'fo_FO':
+			case 'fur':
+			case 'fur_IT':
+			case 'fy':
+			case 'fy_DE':
+			case 'fy_NL':
+			case 'gl':
+			case 'gl_ES':
+			case 'gu':
+			case 'gu_IN':
+			case 'ha':
+			case 'ha_NG':
+			case 'he':
+			case 'he_IL':
+			case 'hu':
+			case 'hu_HU':
+			case 'is':
+			case 'is_IS':
+			case 'it':
+			case 'it_CH':
+			case 'it_IT':
+			case 'ku':
+			case 'ku_TR':
+			case 'lb':
+			case 'lb_LU':
+			case 'ml':
+			case 'ml_IN':
+			case 'mn':
+			case 'mn_MN':
+			case 'mr':
+			case 'mr_IN':
+			case 'nah':
+			case 'nb':
+			case 'nb_NO':
+			case 'ne':
+			case 'ne_NP':
+			case 'nl':
+			case 'nl_AW':
+			case 'nl_BE':
+			case 'nl_NL':
+			case 'nn':
+			case 'nn_NO':
+			case 'no':
+			case 'om':
+			case 'om_ET':
+			case 'om_KE':
+			case 'or':
+			case 'or_IN':
+			case 'pa':
+			case 'pa_IN':
+			case 'pa_PK':
+			case 'pap':
+			case 'pap_AN':
+			case 'pap_AW':
+			case 'pap_CW':
+			case 'ps':
+			case 'ps_AF':
+			case 'pt':
+			case 'pt_BR':
+			case 'pt_PT':
+			case 'so':
+			case 'so_DJ':
+			case 'so_ET':
+			case 'so_KE':
+			case 'so_SO':
+			case 'sq':
+			case 'sq_AL':
+			case 'sq_MK':
+			case 'sv':
+			case 'sv_FI':
+			case 'sv_SE':
+			case 'sw':
+			case 'sw_KE':
+			case 'sw_TZ':
+			case 'ta':
+			case 'ta_IN':
+			case 'ta_LK':
+			case 'te':
+			case 'te_IN':
+			case 'tk':
+			case 'tk_TM':
+			case 'ur':
+			case 'ur_IN':
+			case 'ur_PK':
+			case 'zu':
+			case 'zu_ZA':
+				return ($number == 1) ? 0 : 1;
+			case 'am':
+			case 'am_ET':
+			case 'bh':
+			case 'fil':
+			case 'fil_PH':
+			case 'fr':
+			case 'fr_BE':
+			case 'fr_CA':
+			case 'fr_CH':
+			case 'fr_FR':
+			case 'fr_LU':
+			case 'gun':
+			case 'hi':
+			case 'hi_IN':
+			case 'hy':
+			case 'hy_AM':
+			case 'ln':
+			case 'ln_CD':
+			case 'mg':
+			case 'mg_MG':
+			case 'nso':
+			case 'nso_ZA':
+			case 'ti':
+			case 'ti_ER':
+			case 'ti_ET':
+			case 'wa':
+			case 'wa_BE':
+			case 'xbr':
+				return (($number == 0) || ($number == 1)) ? 0 : 1;
+			case 'be':
+			case 'be_BY':
+			case 'bs':
+			case 'bs_BA':
+			case 'hr':
+			case 'hr_HR':
+			case 'ru':
+			case 'ru_RU':
+			case 'ru_UA':
+			case 'sr':
+			case 'sr_ME':
+			case 'sr_RS':
+			case 'uk':
+			case 'uk_UA':
+				return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
+			case 'cs':
+			case 'cs_CZ':
+			case 'sk':
+			case 'sk_SK':
+				return ($number == 1) ? 0 : ((($number >= 2) && ($number <= 4)) ? 1 : 2);
+			case 'ga':
+			case 'ga_IE':
+				return ($number == 1) ? 0 : (($number == 2) ? 1 : 2);
+			case 'lt':
+			case 'lt_LT':
+				return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
+			case 'sl':
+			case 'sl_SI':
+				return ($number % 100 == 1) ? 0 : (($number % 100 == 2) ? 1 : ((($number % 100 == 3) || ($number % 100 == 4)) ? 2 : 3));
+			case 'mk':
+			case 'mk_MK':
+				return ($number % 10 == 1) ? 0 : 1;
+			case 'mt':
+			case 'mt_MT':
+				return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 1) && ($number % 100 < 11))) ? 1 : ((($number % 100 > 10) && ($number % 100 < 20)) ? 2 : 3));
+			case 'lv':
+			case 'lv_LV':
+				return ($number == 0) ? 0 : ((($number % 10 == 1) && ($number % 100 != 11)) ? 1 : 2);
+			case 'pl':
+			case 'pl_PL':
+				return ($number == 1) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 12) || ($number % 100 > 14))) ? 1 : 2);
+			case 'cy':
+			case 'cy_GB':
+				return ($number == 1) ? 0 : (($number == 2) ? 1 : ((($number == 8) || ($number == 11)) ? 2 : 3));
+			case 'ro':
+			case 'ro_RO':
+				return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2);
+			case 'ar':
+			case 'ar_AE':
+			case 'ar_BH':
+			case 'ar_DZ':
+			case 'ar_EG':
+			case 'ar_IN':
+			case 'ar_IQ':
+			case 'ar_JO':
+			case 'ar_KW':
+			case 'ar_LB':
+			case 'ar_LY':
+			case 'ar_MA':
+			case 'ar_OM':
+			case 'ar_QA':
+			case 'ar_SA':
+			case 'ar_SD':
+			case 'ar_SS':
+			case 'ar_SY':
+			case 'ar_TN':
+			case 'ar_YE':
+				return ($number == 0) ? 0 : (($number == 1) ? 1 : (($number == 2) ? 2 : ((($number % 100 >= 3) && ($number % 100 <= 10)) ? 3 : ((($number % 100 >= 11) && ($number % 100 <= 99)) ? 4 : 5))));
+			default:
+				return 0;
+		}
+	}
 }

vendor_prefixed/illuminate/translation/LoaderInterface.php

Indentation +23 added lines, -23 removed lines

@@ -10,29 +10,29 @@
 
 interface LoaderInterface
 {
-    /**
-     * Load the messages for the given locale.
-     *
-     * @param  string  $locale
-     * @param  string  $group
-     * @param  string  $namespace
-     * @return array
-     */
-    public function load($locale, $group, $namespace = null);
+	/**
+	 * Load the messages for the given locale.
+	 *
+	 * @param  string  $locale
+	 * @param  string  $group
+	 * @param  string  $namespace
+	 * @return array
+	 */
+	public function load($locale, $group, $namespace = null);
 
-    /**
-     * Add a new namespace to the loader.
-     *
-     * @param  string  $namespace
-     * @param  string  $hint
-     * @return void
-     */
-    public function addNamespace($namespace, $hint);
+	/**
+	 * Add a new namespace to the loader.
+	 *
+	 * @param  string  $namespace
+	 * @param  string  $hint
+	 * @return void
+	 */
+	public function addNamespace($namespace, $hint);
 
-    /**
-     * Get an array of all the registered namespaces.
-     *
-     * @return array
-     */
-    public function namespaces();
+	/**
+	 * Get an array of all the registered namespaces.
+	 *
+	 * @return array
+	 */
+	public function namespaces();
 }

vendor_prefixed/illuminate/translation/ArrayLoader.php

Indentation +57 added lines, -57 removed lines

@@ -10,69 +10,69 @@
 
 class ArrayLoader implements LoaderInterface
 {
-    /**
-     * All of the translation messages.
-     *
-     * @var array
-     */
-    protected $messages = [];
+	/**
+	 * All of the translation messages.
+	 *
+	 * @var array
+	 */
+	protected $messages = [];
 
-    /**
-     * Load the messages for the given locale.
-     *
-     * @param  string  $locale
-     * @param  string  $group
-     * @param  string  $namespace
-     * @return array
-     */
-    public function load($locale, $group, $namespace = null)
-    {
-        $namespace = $namespace ?: '*';
+	/**
+	 * Load the messages for the given locale.
+	 *
+	 * @param  string  $locale
+	 * @param  string  $group
+	 * @param  string  $namespace
+	 * @return array
+	 */
+	public function load($locale, $group, $namespace = null)
+	{
+		$namespace = $namespace ?: '*';
 
-        if (isset($this->messages[$namespace][$locale][$group])) {
-            return $this->messages[$namespace][$locale][$group];
-        }
+		if (isset($this->messages[$namespace][$locale][$group])) {
+			return $this->messages[$namespace][$locale][$group];
+		}
 
-        return [];
-    }
+		return [];
+	}
 
-    /**
-     * Add a new namespace to the loader.
-     *
-     * @param  string  $namespace
-     * @param  string  $hint
-     * @return void
-     */
-    public function addNamespace($namespace, $hint)
-    {
-        //
-    }
+	/**
+	 * Add a new namespace to the loader.
+	 *
+	 * @param  string  $namespace
+	 * @param  string  $hint
+	 * @return void
+	 */
+	public function addNamespace($namespace, $hint)
+	{
+		//
+	}
 
-    /**
-     * Add messages to the loader.
-     *
-     * @param  string  $locale
-     * @param  string  $group
-     * @param  array  $messages
-     * @param  string|null  $namespace
-     * @return $this
-     */
-    public function addMessages($locale, $group, array $messages, $namespace = null)
-    {
-        $namespace = $namespace ?: '*';
+	/**
+	 * Add messages to the loader.
+	 *
+	 * @param  string  $locale
+	 * @param  string  $group
+	 * @param  array  $messages
+	 * @param  string|null  $namespace
+	 * @return $this
+	 */
+	public function addMessages($locale, $group, array $messages, $namespace = null)
+	{
+		$namespace = $namespace ?: '*';
 
-        $this->messages[$namespace][$locale][$group] = $messages;
+		$this->messages[$namespace][$locale][$group] = $messages;
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * Get an array of all the registered namespaces.
-     *
-     * @return array
-     */
-    public function namespaces()
-    {
-        return [];
-    }
+	/**
+	 * Get an array of all the registered namespaces.
+	 *
+	 * @return array
+	 */
+	public function namespaces()
+	{
+		return [];
+	}
 }