diff --git a/laravel/str.php b/laravel/str.php index 22ccd414..9ef75ee9 100644 --- a/laravel/str.php +++ b/laravel/str.php @@ -10,7 +10,7 @@ class Str { */ public static function lower($value) { - return function_exists('mb_strtolower') ? mb_strtolower($value, Config::get('application.encoding')) : strtolower($value); + return function_exists('mb_strtolower') ? mb_strtolower($value, static::encoding()) : strtolower($value); } /** @@ -21,7 +21,7 @@ class Str { */ public static function upper($value) { - return function_exists('mb_strtoupper') ? mb_strtoupper($value, Config::get('application.encoding')) : strtoupper($value); + return function_exists('mb_strtoupper') ? mb_strtoupper($value, static::encoding()) : strtoupper($value); } /** @@ -32,7 +32,7 @@ class Str { */ public static function title($value) { - return (function_exists('mb_convert_case')) ? mb_convert_case($value, MB_CASE_TITLE, Config::get('application.encoding')) : ucwords(strtolower($value)); + return (function_exists('mb_convert_case')) ? mb_convert_case($value, MB_CASE_TITLE, static::encoding()) : ucwords(strtolower($value)); } /** @@ -43,7 +43,7 @@ class Str { */ public static function length($value) { - return function_exists('mb_strlen') ? mb_strlen($value, Config::get('application.encoding')) : strlen($value); + return function_exists('mb_strlen') ? mb_strlen($value, static::encoding()) : strlen($value); } /** @@ -54,7 +54,7 @@ class Str { */ public static function ascii($value) { - $foreign = Config::get('ascii'); + $foreign = IoC::container()->resolve('laravel.config')->get('ascii'); $value = preg_replace(array_keys($foreign), array_values($foreign), $value); @@ -102,4 +102,14 @@ class Str { } } + /** + * Get the application encoding from the configuration class. + * + * @return string + */ + private static function encoding() + { + return IoC::container()->resolve('laravel.config')->get('application.encoding'); + } + } \ No newline at end of file diff --git a/laravel/url.php b/laravel/url.php index db535b0c..76fd08d7 100644 --- a/laravel/url.php +++ b/laravel/url.php @@ -24,11 +24,6 @@ class URL { * * If the given URL is already well-formed, it will be returned unchanged. * - * - * // Generate the URL: http://example.com/index.php/user/profile - * $url = URL::to('user/profile'); - * - * * @param string $url * @param bool $https * @return string @@ -47,11 +42,6 @@ class URL { /** * Generate an application URL with HTTPS. * - * - * // Generate the URL: https://example.com/index.php/user/profile - * $url = URL::to_secure('user/profile'); - * - * * @param string $url * @return string */ @@ -66,14 +56,6 @@ class URL { * The index file will not be added to asset URLs. If the HTTPS option is not * specified, HTTPS will be used when the active request is also using HTTPS. * - * - * // Generate the URL: http://example.com/img/picture.jpg - * $url = URL::to_asset('img/picture.jpg'); - * - * // Generate the URL: https://example.com/img/picture.jpg - * $url = URL::to_asset('img/picture.jpg', true); - * - * * @param string $url * @param bool $https * @return string @@ -93,14 +75,6 @@ class URL { * * Optional parameters will be convereted to spaces if no parameter values are specified. * - * - * // Generate a URL for the "profile" named route - * $url = URL::to_route('profile'); - * - * // Generate a URL for the "profile" named route with parameters. - * $url = URL::to_route('profile', array('fred')); - * - * * @param string $name * @param array $parameters * @param bool $https @@ -128,11 +102,6 @@ class URL { /** * Generate a HTTPS URL from a route name. * - * - * // Generate a HTTPS URL for the "profile" named route - * $url = URL::to_secure_route('profile'); - * - * * @param string $name * @param array $parameters * @return string @@ -145,19 +114,11 @@ class URL { /** * Generate a URL friendly "slug". * - * - * // Returns "my-first-post" - * $slug = URL::slug('My First Post!!'); - * - * // Returns "my_first_post" - * $slug = URL::slug('My First Post!!', '_'); - * - * * @param string $title * @param string $separator * @return string */ - public static function slug($title, $separator = '-') + public function slug($title, $separator = '-') { $title = Str::ascii($title); @@ -172,17 +133,6 @@ class URL { /** * Magic Method for dynamically creating URLs to named routes. - * - * - * // Generate a URL for the "profile" named route - * $url = URL::to_profile(); - * - * // Generate a URL for the "profile" named route using HTTPS - * $url = URL::to_secure_profile(); - * - * // Generate a URL for the "profile" named route with parameters. - * $url = URL::to_profile(array('fred')); - * */ public function __call($method, $parameters) {