diff --git a/laravel/autoloader.php b/laravel/autoloader.php index cff7afb4..c81fc6fa 100644 --- a/laravel/autoloader.php +++ b/laravel/autoloader.php @@ -116,7 +116,7 @@ protected static function load_psr($class, $directory = null) // // We will check for both lowercase and CamelCase files as // Laravel uses a lowercase version of PSR-0, while true - // PSR-0 uses CamelCase for file names. + // PSR-0 uses CamelCase for all file names. foreach ($directories as $directory) { if (file_exists($path = $directory.strtolower($file).EXT)) diff --git a/laravel/cli/console.php b/laravel/cli/console.php index f909fd7e..1512aaa4 100644 --- a/laravel/cli/console.php +++ b/laravel/cli/console.php @@ -5,8 +5,6 @@ class Console { /** * Parse the command line arguments and return the results. * - * The returned array contains the arguments and the options. - * * @param array $argv * @param array */ diff --git a/laravel/cli/tasks/bundle/bundler.php b/laravel/cli/tasks/bundle/bundler.php index 35b684ef..66dd16d1 100644 --- a/laravel/cli/tasks/bundle/bundler.php +++ b/laravel/cli/tasks/bundle/bundler.php @@ -73,10 +73,6 @@ protected function get($bundles) $repository = IoC::resolve('bundle.repository'); - // This method is primarily responsible for gathering the data - // for all bundles that need to be installed. This allows us - // to verify the existence of the bundle before even getting - // started on the actual installation process. foreach ($bundles as $bundle) { // First we'll call the bundle repository to gather the bundle data diff --git a/laravel/cli/tasks/bundle/publisher.php b/laravel/cli/tasks/bundle/publisher.php index 5df2afb1..3454b18b 100644 --- a/laravel/cli/tasks/bundle/publisher.php +++ b/laravel/cli/tasks/bundle/publisher.php @@ -32,7 +32,7 @@ public function publish($bundle) */ protected function move($source, $destination) { - File::copy_dir($source, $destination); + File::cpdir($source, $destination); } /** diff --git a/laravel/cli/tasks/migrate/database.php b/laravel/cli/tasks/migrate/database.php index 0684b359..29bfb154 100644 --- a/laravel/cli/tasks/migrate/database.php +++ b/laravel/cli/tasks/migrate/database.php @@ -78,7 +78,7 @@ public function batch() */ protected function table() { - return DB::connection()->table('laravel_migrations'); + return DB::connection(Request::server('cli.db'))->table('laravel_migrations'); } } \ No newline at end of file diff --git a/laravel/cli/tasks/session.php b/laravel/cli/tasks/session.php deleted file mode 100644 index 8f9511af..00000000 --- a/laravel/cli/tasks/session.php +++ /dev/null @@ -1,69 +0,0 @@ -create(); - - // The session table consists simply of an ID, a UNIX timestamp to - // indicate the expiration time, and a blob field which will hold - // the serialized form of the session payload. - $table->string('id')->length(40)->primary('session_primary'); - - $table->integer('last_activity'); - - $table->text('data'); - }); - - // By default no session driver is specified in the configuration. - // Since the developer is requesting that the session table be - // created on the database, we'll set the driver to database - // to save an extra step for the developer. - $config = File::get(APP_PATH.'config/session'.EXT); - - $config = str_replace("'driver' => '',", "'driver' => 'database',", $config); - - File::put(APP_PATH.'config/session'.EXT, $config); - - echo "The table has been created! Database set as session driver."; - } - - /** - * Sweep the expired sessions from storage. - * - * @param array $arguments - * @return void - */ - public function sweep($arguments = array()) - { - $driver = \Laravel\Session::factory(Config::get('session.driver')); - - // If the driver implements the "Sweeper" interface, we know that - // it can sweep expired sessions from storage. Not all drivers - // need be sweepers, as stores like Memcached and APC will - // perform their own garbage collection. - if ($driver instanceof Sweeper) - { - $lifetime = Config::get('session.lifetime'); - - $driver->sweep(time() - ($lifetime * 60)); - } - - echo "The session table has been swept!"; - } - -} \ No newline at end of file diff --git a/laravel/file.php b/laravel/file.php index 3e7143ea..c72c577e 100644 --- a/laravel/file.php +++ b/laravel/file.php @@ -181,7 +181,7 @@ public static function is($extensions, $path) * @param string $destination * @return void */ - public static function copy_dir($source, $destination) + public static function cpdir($source, $destination) { if ( ! is_dir($source)) return; @@ -207,7 +207,7 @@ public static function copy_dir($source, $destination) { $path = $item->getRealPath(); - static::copy_dir($path, $location); + static::cpdir($path, $location); } // If the file system item is an actual file, we can copy the // file from the bundle asset directory to the public asset diff --git a/laravel/helpers.php b/laravel/helpers.php index 0bad860b..4e8596f8 100644 --- a/laravel/helpers.php +++ b/laravel/helpers.php @@ -21,7 +21,7 @@ function e($value) * @param string $language * @return string */ -function __($key, $replacements = array(), $language = null) +function lang($key, $replacements = array(), $language = null) { return Laravel\Lang::line($key, $replacements, $language); } diff --git a/laravel/ioc.php b/laravel/ioc.php index 813c5995..0c3e168f 100644 --- a/laravel/ioc.php +++ b/laravel/ioc.php @@ -124,11 +124,6 @@ public static function resolve($name, $parameters = array()) return static::$singletons[$name]; } - if ( ! static::registered($name)) - { - throw new \Exception("Error resolving [$name]. No resolver has been registered."); - } - $object = call_user_func(static::$registry[$name]['resolver'], $parameters); // If the resolver is registering as a singleton resolver, we will cache diff --git a/laravel/log.php b/laravel/log.php index b2ef534a..cdc550af 100644 --- a/laravel/log.php +++ b/laravel/log.php @@ -43,7 +43,7 @@ public static function write($type, $message) { $message = date('Y-m-d H:i:s').' '.Str::upper($type)." - {$message}".PHP_EOL; - File::append(STORAGE_PATH.'logs/'.date('Y-m').'.log', $message); + File::append(STORAGE_PATH.'logs/'.date('Y-m-d').'.log', $message); } /** diff --git a/laravel/paginator.php b/laravel/paginator.php index b08b8959..c1942311 100644 --- a/laravel/paginator.php +++ b/laravel/paginator.php @@ -375,17 +375,16 @@ protected function link($page, $text, $class) } /** - * Create the "appendage" that should be attached to every pagination link. - * - * The developer may assign an array of values that will be converted to a - * query string and attached to every pagination link. This allows simple - * implementation of sorting or other things the developer may need. + * Create the "appendage" to be attached to every pagination link. * * @param array $appends * @return string */ protected function appendage($appends) { + // The developer may assign an array of values that will be converted to a + // query string and attached to every pagination link. This allows simple + // implementation of sorting or other things the developer may need. if ( ! is_null($this->appendage)) return $this->appendage; if (count($appends) <= 0)