From 02ea66eb922ade4646acbbe22be6354ad8916a0f Mon Sep 17 00:00:00 2001 From: Jonathon Hill Date: Mon, 12 Nov 2012 17:26:36 -0500 Subject: Code style fixes Signed-off-by: Jonathon Hill --- system/libraries/Migration.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'system') diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php index af9e53030..d08afa598 100644 --- a/system/libraries/Migration.php +++ b/system/libraries/Migration.php @@ -187,7 +187,7 @@ class CI_Migration { $migrations = $this->find_migrations(); - if ($target_version > 0 AND ! isset($migrations[$target_version])) + if ($target_version > 0 && ! isset($migrations[$target_version])) { $this->_error_string = sprintf($this->lang->line('migration_not_found'), $target_version); return FALSE; @@ -216,7 +216,7 @@ class CI_Migration { foreach ($migrations as $number => $file) { // Check for sequence gaps - if ($this->_migration_type === 'sequential' AND $previous !== FALSE AND abs($number - $previous) > 1) + if ($this->_migration_type === 'sequential' && $previous !== FALSE && abs($number - $previous) > 1) { $this->_error_string = sprintf($this->lang->line('migration_sequence_gap'), $number); return FALSE; @@ -241,9 +241,10 @@ class CI_Migration { // Run migrations that are inside the target range if ( - ($method === 'up' AND $number > $current_version AND $number <= $target_version) OR - ($method === 'down' AND $number <= $current_version AND $number > $target_version) - ) { + ($method === 'up' && $number > $current_version && $number <= $target_version) OR + ($method === 'down' && $number <= $current_version && $number > $target_version) + ) + { log_message('debug', 'Migrating '.$method.' from version '.$current_version.' to version '.$number); call_user_func(array(new $class, $method)); $current_version = $number; -- cgit v1.2.3-24-g4f1b