Skip to content

Commit

Permalink
Merge pull request #137 from websharks/feature/131
Browse files Browse the repository at this point in the history
PR: feature/131
  • Loading branch information
jaswsinc committed Aug 24, 2016
2 parents f799005 + 671fd37 commit 150faef
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .gitchange
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1464312672
49dd4154d8f5d3b70691c8e3f52a063a49137fb7:57bcdbdf34eb37.21692013
49dd4154d8f5d3b70691c8e3f52a063a49137fb7:57bce46a00a398.67916669
13 changes: 13 additions & 0 deletions src/psr4/setups/properties/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,19 @@
<property name="project_php_required_bits" value="0" />
</then>
</if>
<if>
<not>
<isset property="project_php_required_functions" />
</not>
<then>
<property name="project_php_required_functions" value="" />
<property name="_project_php_required_functions" value="" />
</then>
<else>
<php expression="&quot;'&quot;.implode(&quot;', '&quot;, preg_split('/[\s,]+/u', '${project_php_required_functions}', -1, PREG_SPLIT_NO_EMPTY)).&quot;'&quot;" returnProperty="_project_php_required_functions" level="verbose" />
<php expression="&quot;${_project_php_required_functions}&quot; === &quot;''&quot; ? '' : &quot;${_project_php_required_functions}&quot;" returnProperty="_project_php_required_functions" level="verbose" />
</else>
</if>
<if>
<not>
<isset property="project_php_required_extensions" />
Expand Down
1 change: 1 addition & 0 deletions src/psr4/targets/builds/in-base-dir/version-tokens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<regExp pattern='"[^"]*?"([,;]\s*)(#\s*)?\/\/php\-up\-to\-version\/\/$' replace='"${project_php_tested_up_to_version}"$1$2//php-up-to-version//' modifiers="um" />

<regExp pattern="\b[0-9]+([,;]\s*)(#\s*)?\/\/php\-required\-bits\/\/$" replace="${project_php_required_bits}$1$2//php-required-bits//" modifiers="um" />
<regExp pattern="\barray\s*\([^()]*\)([,;]\s*)(#\s*)?\/\/php\-required\-functions\/\/" replace="array(${_project_php_required_functions})$1$2//php-required-functions//" modifiers="u" />
<regExp pattern="\barray\s*\([^()]*\)([,;]\s*)(#\s*)?\/\/php\-required\-extensions\/\/" replace="array(${_project_php_required_extensions})$1$2//php-required-extensions//" modifiers="u" />
</replaceRegExp>
</filterChain>
Expand Down
1 change: 1 addition & 0 deletions src/psr4/targets/builds/in-build-dir/version-tokens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<regExp pattern='"[^"]*?"([,;]\s*)(#\s*)?\/\/php\-up\-to\-version\/\/$' replace='"${project_php_tested_up_to_version}"$1$2//php-up-to-version//' modifiers="um" />

<regExp pattern="\b[0-9]+([,;]\s*)(#\s*)?\/\/php\-required\-bits\/\/$" replace="${project_php_required_bits}$1$2//php-required-bits//" modifiers="um" />
<regExp pattern="\barray\s*\([^()]*\)([,;]\s*)(#\s*)?\/\/php\-required\-functions\/\/" replace="array(${_project_php_required_functions})$1$2//php-required-functions//" modifiers="u" />
<regExp pattern="\barray\s*\([^()]*\)([,;]\s*)(#\s*)?\/\/php\-required\-extensions\/\/" replace="array(${_project_php_required_extensions})$1$2//php-required-extensions//" modifiers="u" />
</replaceRegExp>
</filterChain>
Expand Down

0 comments on commit 150faef

Please sign in to comment.