| pipeline { | |
| agent any | |
| stages { | |
| stage('Prepare') { | |
| steps { | |
| sh 'composer install' | |
| sh 'rm -rf build/api' | |
| sh 'rm -rf build/coverage' | |
| sh 'rm -rf build/logs' |
| /*********************************************************** | |
| ******* SIMPLE TEST **/ | |
| class A { | |
| function t() { | |
| echo get_calling_class(); | |
| } | |
| } | |
| class B { |
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
| <?php | |
| /** | |
| * CSVReader | |
| * Class to parse and iterate CSV files on the fly | |
| * | |
| * <code> | |
| * $myCsv = new CSVReader("$path/csv.csv"); | |
| * | |
| * foreach ($myCsv as $data) { | |
| * echo $data[2] ."\n"; |
| #!/usr/bin/php | |
| <?php | |
| /** | |
| * .git/hooks/pre-commit | |
| * | |
| * This pre-commit hooks will check for PHP error (lint), and make sure the code | |
| * is PSR compliant. | |
| * | |
| * Dependecy: PHP-CS-Fixer (https://github.com/fabpot/PHP-CS-Fixer) | |
| * |
| <!DOCTYPE html> | |
| <html> | |
| <head> | |
| <title>Capture Photo</title> | |
| <meta name="viewport" content="width=device-width,height=device-height,initial-scale=1"/> | |
| <script type="text/javascript" charset="utf-8" src="js/phonegap.js"></script> | |
| <script type="text/javascript" charset="utf-8"> | |
| var pictureSource; // picture source | |
| var destinationType; // sets the format of returned value |
| <?php | |
| /* | |
| * Předpokládá ACL následujícího tvaru: | |
| * resource: Jméno presenteru / komponenty (PHP, včetně namespace) | |
| * privilege: Jméno akce / signálu | |
| */ | |
| public function userAllowed($component, $destination = NULL) | |
| { | |
| if($destination === NULL) // No destination specified, can cause unexpected results when used with n:if-allowed as it would check for previous link! |