Skip to content

Commit 7453c92

Browse files
committed
merge code
2 parents 23736c2 + cfba6f3 commit 7453c92

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

.gitignore

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
# Created by .ignore support plugin (hsz.mobi)
2-
### Example user template template
3-
### Example user template
4-
5-
# IntelliJ project files
6-
.idea/
71

82
### OSX template
93
*.DS_Store
104

11-
# Icon must end with two \r
12-
Icon
13-
14-
# Thumbnails
15-
._*
16-
17-
5+
.idea/
6+
.phpintel/
7+
/vendor/
8+
!README.md
9+
!.gitkeep
10+
composer.lock
11+
*.swp
12+
*.swo
13+
.DS_Store

src/ValidationTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public function validate(array $onlyChecked = [], $hasErrorStop=false)
140140
throw new \InvalidArgumentException('Must be defined property \'data (array)\' in the class used.');
141141
}
142142

143-
if ( $this->_hasValidated || !$this->data ) {
143+
if ( $this->_hasValidated ) {
144144
return $this;
145145
}
146146

0 commit comments

Comments
 (0)