浏览代码

Improve bitmasks for 3.x

dereuromark 8 年之前
父节点
当前提交
fac81b0f0d
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      src/Model/Behavior/BitmaskedBehavior.php

+ 5 - 2
src/Model/Behavior/BitmaskedBehavior.php

@@ -62,9 +62,12 @@ class BitmaskedBehavior extends Behavior {
 		if (is_callable($config['bits'])) {
 			$config['bits'] = call_user_func($config['bits']);
 		} elseif (is_string($config['bits']) && method_exists($entity, $config['bits'])) {
-			$config['bits'] = version_compare(PHP_VERSION, '7.0', '<') ? $entity->{$config['bits']}() : $entity::{$config['bits']}();
+			$method = $config['bits'];
+			$config['bits'] = version_compare(PHP_VERSION, '7.0', '<') ? $entity->$method() : $entity::$method();
 		} elseif (is_string($config['bits']) && method_exists($this->_table, $config['bits'])) {
-			$config['bits'] = version_compare(PHP_VERSION, '7.0', '<') ? $this->_table->{$config['bits']}() : $this->_table::{$config['bits']}();
+			$table = $this->_table;
+			$method = $config['bits'];
+			$config['bits'] = version_compare(PHP_VERSION, '7.0', '<') ? $table->$method() : $table::$method();
 		} elseif (!is_array($config['bits'])) {
 			$config['bits'] = false;
 		}