From 7c20c39252e64cf255ae6aae9a35f10785891d15 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 28 May 2018 14:23:19 -0300 Subject: [PATCH 001/203] =?UTF-8?q?Integra=C3=A7=C3=A3o=20Cont=C3=ADnua?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ deploy_rsa.enc | Bin 0 -> 3248 bytes 2 files changed, 59 insertions(+) create mode 100644 .travis.yml create mode 100644 deploy_rsa.enc diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..d0b0fbc3e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,59 @@ +sudo: false +language: php +php: +- 7.1 +- hhvm +- nightly +matrix: + allow_failures: + - php: 7.1 + - php: hhvm + - php: nightly + fast_finish: true +addons: +- ssh_know_hosts: + - "$ssh_host" +apt: + packages: + - sshpass +before_install: +- openssl aes-256-cbc -K $encrypted_0a4ce2426081_key -iv $encrypted_0a4ce2426081_iv + -in deploy_rsa.enc -out deploy_rsa -d +- openssl aes-256-cbc -K $encrypted_fb877661573d_key -iv $encrypted_fb877661573d_iv + -in deploy_rsa.enc -out deploy_rsa -d +- sudo apt-get install sshpass +install: +- echo -e "Install" +script: phpunit --version +after_success: +- eval "$(ssh-agent -s)" +- chmod 600 deploy_rsa +- ssh-add deploy_rsa +- echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config +- sshpass -p '$ssh_user_pass' ssh -o StrictHostKeyChecking=no $ssh_user@$ssh_host + "ls" +deploy: +- provider: script + script: sshpass -p '$ssh_user_pass' ssh -o StrictHostKeyChecking=no $ssh_user@$ssh_host + "ls" + skip_cleanup: true + on: + branch: master +cache: + directories: + - vendor + - composer +notifications: + email: + on_success: never + on_failure: always +env: + global: + - secure: LnUpxgHL/Qgpbg20mRErlnwb8tvNs6f7uPRe9c82UuMP69uDZeD3K5GNzL6u0Y+C/zNHk7tCnUszDC7FtQAij6qi72HHW2zz4zVJ+DFI3b+hx7+rSKsjtbnJChTbknSu3rW+yHYRTIUZJQ/Tg6thDLKzU0a4VRb+ickDpRYLyP+Cf4+xs7rwAhjiboMNIGXahrCpnbhctmOhRgZaHvfnPB9prRs5lOCCBQqSwMmjEo7OJeCCUjfpU5xq3EjUEzwjzzBlSf3240PS/LOBFr2iGF30VT9LDTb1iUZU1gTcaxaK+/EjKLG/wtcH8TOaLJpsksbnMkSTrG3ICblXl1G4Itu8IHzLgOmWoiWIVXZ4y17aYyj/y7YZtX+fjB6qs9RG5ZnSpHkSDEni8CCC8Ltf9jVSkLEust/bNLgkd02hJ4xtVxOaoBYEh3hcylJ/co8BTDdbNyT3BwrFc4f2jfRh5DYzyrKaTG5IJAT2BfyjD/BsxBE3EgIuJFja1zVJKMcuCmogDiHi6sb0zhF+LbLy0nXqvysTrMEYbDppVYQloz3BKb2v2m/jc89G7v8AjnvwTUgj64PUj+p10ngfIA+FHPILLtd/fNm0zRIRDqSfE7rpGZo9EoZ9jq0wVSmy0DK8kFTX+9RFW8xYmFnTgB3beKWqdK9CAqXEeeD3ABejXTc= + - secure: ZgQILlaSklEldQIISTfQC+0vhutWYs3nWzQP6bRluHmzb0PSz/7VqoFfzj7mi3AEtvsNIfDGv1AL8NUdqj9ZKBhgcFN178UcM87ObXIhpkZ43yIcNEHGQXBu0WN9Hn2kpj8sTWUFkzDUfLznShR8FDWwyxHHdH5TAMYJ8ZvLaDWZBAKJ0V+PYJASoI9CKVT16rx+K87MSavqvgLHsRticLgK/V/KVi5CMr/4J2WSeUpgzxKPLKP2yoTspJXbcUWuZcbXR+hp/MIvFJVYw7kK6wpixAzAuw6evrYwfOxLjZ5P2pNFrpMtBfONYKFpWxZyiPeUO8kBAV5R7XpzUUzfxRgu9Ca+6VYm8mNfHck4p7NLK+IjHLi1CrL3YYu8Ck1O01ah2i1ZIEaGL+NVRdrTHNOWZfWok3Wsv4UyLsgAeM4/K6dExauUqgVE/cwm/mwQ9ycoAoqfwVteHBmb7N+2nhlQwP1K1RAArS0ldm16aOD/eYcQ9kd5IQjRHr+QnMmhm7XRLJwxxL/Wpss7DNG4zWfEFNS9yYfDa8q0CRLT68sSjd5egnGyjYrW5dMSzFSu8G6CR/NvXTExlElxmilehDoLrGqRmLedW/jlbPQmNf6T+fVOE/r5vn//wMpk/e7rc0ivXh0YSDfyZ/3I052Uqingxl0ruLsoM6zIQW3b91U= + - secure: uUM5BXTWfh6jWqBdbu7sUrVVo4dUMNdorPaB6DNo0xOcjK/+b6lI41oQODmLKz48in0N0aWU+DH4gf3kkyhd/4ebPozHP5R/31ygYiNUzPFttZteV1rzCDaK/kwR8bH1p0hYibSeuqQgLt+VA7MD87x1/V1HrxZ+BPwYcrt8zNOb1ufqanu8t2URhyng5ZySOuBtXoDi9mR3KHX/V6DI1IybuAroV6LZm6d3PKpyD4GQtj48uw2IETQqMYXkHwYKPgIBLeXVDqMV8JP3MQ5WppheL7RBwHuClIAEPK47WEcnVqWkHssH3E3whzpIOo99R6EqRfVDAGwZAu2+SDuqFu5QGDfAF99ZSbh/m96lj9/drWK+0KOHOtEqhEq5FycOkLuHREIdLIg9uGqXLaGY+noAU7jXi70Uk3v4zrDxUocIdPrMaTutrE0pUPacCgnHtkTOkpJr7PHq2Zry8kMU39IRJQ3nIVcxSoUlWv9Xd+RjMw833RdZ1m5HVzUT+zE2jr8jhJgiNb/amQpH8pYcqI+NDqk8RFn9O0fhWYJmePtgDK0++9VAdBs8A4lmiFbkB+qotdZLemFhQObNOQsK/a3YoDgvjGfnvMXyGLdEFoT962mmnMteBq/mCcSEnRqLSA5gifzoJyeLRXKmVpoRAwrtjn5u8Qa+a8BQKCpDyno= + - secure: TxMSWrKRGiDamfCdmpfVJMG9fpXrlgGhS6Pbm7iO3eMMS6v+ZF5Qo7RyGYPsJvspKuncGpuRynoKff8jWsouYDqyMFZvtmG9EyJI2GYvy7K4E2HRRrZeNZHviP0tKq++0L5VLiY3pr9uUZYbmjKTk2k5V7ddd2EVK6AIqh/7dLmf9FPZ7HE+QuEQiaijBZ/mvBW+ntZHfZoyv/yWW5zPcA6vxAdtMa1iXhv6ByGFd+odCblq6HmBqDlaASDoXrrTSc0bkXeX44tqt+OMDhwsEqtzLlI5x1WYnYt5lkFuGjTn+WG/PLmrJxbq1c4MXU1cgcaiuRP8Y/Gq1XoffbFa9KZ/jfx0c9dxwRIedJrctrGC8jSSmlM1C+p9QFGWZUhF3b0WgRvP8NYUhQ0ToV3rE4XeApElHd27FYibDkWz72cpq6EiehJoQLFLyKpWcu7gtgjMUbGIllF2k6+oV7jzpgRNktzz5gWH2i1Vj5//Wyq1Md5NJ+sBspTmTcw9s09W2ghG/9bzksS5XtpOFfYVIqkeFbBK0lcGufDNoVSci4kTs12U/OMLcXaEUymHpKCS1UWCj/nRjxUosBBQ+WQzAJixEijTs8t0WKZZ2eDZhTOnpa50WV4DDO/EZHaQ7sgm98Y/V9gwvyLTOifjT2eXDNYXdH90RBGbDoUueyavqag= + - secure: ZZBechMeYwtzFe8dsMDQ3QPLUvZ2P5+abcTZbODMRmOomm5PixOr6EVJhVaUYnEtqgc4AaNnzVGmNrfoyEZC9Kza4hyEfABHPPcMDOUoC8v5HVpX08nLvWs6e5MdFCNeqWlJpTUR1ZVpYjXuIvaVVO9aT1N7ZAZBYPEaPotxPOt1+viJmWOUFpqhap/9VPkSn16DUiz9vQcJQe7PfxclxQkyhFlIhO0LRE//sR42ED1P3/efIRoAdfMSgISuLgQhZZYJ0wrh2aVz5YjRLfq80rQEynLFfCvSVEWhde3ZRGgX7oWo7LRfXF/0t4g/52QhfpWUvFw1fvljhzd/o1xUY6j2u3OS6Atx87QOvdj9a0D33UjWyOEXumUVupoSN5jnFnb41lKSoYwmx7rEEYGtYCBIzBkZfqOiKn0KYn1yIQbW0g6ptlC5C3o0wZchdCTaWnvNd2m6lj+a2j30b88F815qe0V7H9GxzUknccLfG/v/stBOFpYv1zd4bVgcmARHNwWORN6U3C+r9A3AoJkhLRedfsfmcftnxol55Okpz6Jn0z8/KVtuZ6FNlN3qfP5RLE6vP2y1s5fu/EWnsbNkP5JdCWKrRF9rryu3CURpci9f4zYcghuIRMfuZ9muQhdS7MYLJhwldy6lzPYg2l66laRgPkxeTHAamXHalhQXi60= + - secure: VMRxLl42yXCGRsmogIoYb31jzE9dyCpmlyB2fM+VsNNp/WWp1IB5QhhmH5klxw7KG16+Mhz7E9k99v+CmOyMVWmse3l9JXUoImdUNue5csgiMziHXU6A0zXv3EZVI0MfWilBoFOlc91c0n9h1jlUJ9VSBIaac+VqM8Icpw/w2ASha4XujJ02ahnYItmz9WVG2rG7mKYpc9DDHi2zbR+LyNLuX4tvi1CQtkpRiIFbs5eX+vIwQ2bFG1vpbbsiFkFPVGRlfh4DQaNo0Bam08BfsmK4TkYRiGxXZYTBM1QWJKdnzTZOnZ8uaiKCAGxC+5VsWuuqFfn9qPfx/7S43NGwG9aJSglkRZ9S4eKodMjCg+oGosq2dkGasll7owrk1vY1/rBjJodg+Y0q5uOXYfjT/Jmq0c/u0uQewUSdG6mSMEpmbSg43cAeA/9xruM0sVelBzH5zgvzQjUF6yTsN0E3XVwxmS6l1YesnfYXmGnJ1w5vQJMbLaN1FyPoRw0AsaGGqQooL4FEwb+vu299J9x61U4GxKJrJd16mRWItu0Rj4oZ79zdElTRcjvGQz4j1qelDDfxufst9hIqkSjIEzsBPZMIp/49FJfKwgsuB2fl8L3q4XnqPG4AXRRsb25JEMPQYEpvk31kVmtCGadhAKgLrjZ2Kd6amyZ37pt2oASilGA= + - secure: C+qQ9H2aTpZAjHBEW4LcRODxdozEwerA8CF1bQZ2sJCXY0wlP9tikaaNWrCBWGv9/v7X5qIwORXJwGyEAxg331FsJNvQ7i+rNSbna5NlHozWChUQvjPe+fWpCPdAEKeAF+JyDLKRbsWo2SqiaYDsnTXD5BaancOCGqkpEDZrm7HdUL091arG8CJVjUG2OaEo0aNsnuw7Z9NVTw5zD9lmGBlpKlTwXXfjzNg1Y5ThHkfxsCoYWa8rfL+wdec6ZghJFZ6ITZbYKBPbXYIUyJO1dboJi0+EhAnL9rD1NmcK2ERz8d99HqKhzEI/KoHCtOe+czOBhi5/OMe2lza1tL+z3uFF4TS86Qdk7JARegdHdxTPlztcagTd70wUwJ1POMBRnrVdFhnXvWDX87lk0RGvGUlCTsh+lMwZBM4UdMH96Eb+mwECe5qeWE8vGkPEtny6sTKhJvEhHmHmVNL/tYdqXsEdgfSOSHrhXfvesUMvr62/KlA9mFTtAzShom+4Jpx+1OlLdNDHyRmODoRhDJnuHRCOCjXzks8W12Hbg5ej7KnqLO0ymlGQumGoVjWzOHKwdNuItN1mEGRA/p0+nxS2tSAyg9rJF4spFRugGa1yapDzj7bqUfq8oCa4qzIbuiNU22Y8SQMdYJxvHBhq4wLcRX9g7u1uNEtKyykb5+nrKug= + - secure: YQEb1NAiHbgkiaHGJ6FHxMb7CYy44uszfqyC2Yj98ueuZDFJFIJqchUe9k2H3CdayU0i7MhCEk0LL4hSZpXRhyyFs6AxWh82ISPrBaraCyd5x51EoKPeVmTW1MTLjl467HX357Do41JsooMkGX8llpaAzJP5mY7fJmx91Cnpg5dQbAeSWhwSM16yfYHHpQXvoGmTlcj89hoJ7LLTMEg6o+CgGlYnx5LB/vvWxHNiMNVB+IJEMo7MopQUVkVqTEJ+k8x0i2tBdwLNCoMl79xrsYETsSRzn85zuD/wqfY0yfvEwYsKD1YtkjJW14/y4mFFHCyW+/igORknuBRF1qRZEOHeTMiDmNOsA2yi1RXjNIeUpOctCNV29KDAyqkOfQwlKMzezBGoVKRsxd3oWZpjNjnqgQ7lEx5CwQKN5pSxMmd1pWZTkY+Ci9b+VrBvshhdPwBKsjZjS8jDHlX0uT6OHPN17PFziCtKRfh+gukSLJJcxRz9H/4F6NLpFJzx4/UsFLW45XY5BXwucYgUyk+oXeQDlzSXVpAuE2KDOaHWg12jlnWptTq7rHfKE0N61JOgolThCun5i+0L6eydaPNswqUtbB/WlDdkbpDMaUFR/HFDFNkTiJyPpTeYHdsqwq57hqI/D2Otkc28wbVHodYZyxiaLe9gozmD5IYS8Sf9tdM= diff --git a/deploy_rsa.enc b/deploy_rsa.enc new file mode 100644 index 0000000000000000000000000000000000000000..6cf7d99e64f628b5e9b53438af6a020076bd55fe GIT binary patch literal 3248 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 Date: Mon, 28 May 2018 14:47:08 -0300 Subject: [PATCH 002/203] Update .travis.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit integração contínua com travis. --- .travis.yml | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0b0fbc3e..bc8ef7e5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ php: - 7.1 - hhvm - nightly -matrix: +matrix: allow_failures: - php: 7.1 - php: hhvm @@ -17,34 +17,47 @@ apt: packages: - sshpass before_install: -- openssl aes-256-cbc -K $encrypted_0a4ce2426081_key -iv $encrypted_0a4ce2426081_iv - -in deploy_rsa.enc -out deploy_rsa -d -- openssl aes-256-cbc -K $encrypted_fb877661573d_key -iv $encrypted_fb877661573d_iv - -in deploy_rsa.enc -out deploy_rsa -d +#- openssl aes-256-cbc -K $encrypted_0a4ce2426081_key -iv $encrypted_0a4ce2426081_iv +# -in deploy_rsa.enc -out /tmp/deploy_rsa -d +#- openssl aes-256-cbc -K $encrypted_fb877661573d_key -iv $encrypted_fb877661573d_iv +# -in deploy_rsa.enc -out deploy_rsa -d - sudo apt-get install sshpass +#- openssl aes-256-cbc -K $encrypted_0a4ce2426081_key -iv $encrypted_0a4ce2426081_iv + # -in deploy_rsa.enc -out deploy_rsa -d +#- eval "$(ssh-agent -s)" +#- chmod 600 /tmp/deploy_rsa +#- cat /tmp/deploy_rsa +#- ssh-add /tmp/deploy_rsa +#- echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config install: - echo -e "Install" script: phpunit --version -after_success: +after_success: +- echo -e "After success!" +before_deploy: +- openssl aes-256-cbc -K $encrypted_0a4ce2426081_key -iv $encrypted_0a4ce2426081_iv + -in deploy_rsa.enc -out /tmp/deploy_rsa -d - eval "$(ssh-agent -s)" -- chmod 600 deploy_rsa -- ssh-add deploy_rsa +- chmod 600 /tmp/deploy_rsa +- ssh-add /tmp/deploy_rsa - echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config -- sshpass -p '$ssh_user_pass' ssh -o StrictHostKeyChecking=no $ssh_user@$ssh_host - "ls" +#- ssh-add +- ssh-add -l +#- sshpass -p '$ssh_user_pass' ssh $ssh_user@$ssh_host "ls" +- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" +#- cat $ssh_user@$ssh_host $script_deploy_tainacan deploy: - provider: script - script: sshpass -p '$ssh_user_pass' ssh -o StrictHostKeyChecking=no $ssh_user@$ssh_host - "ls" + script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" #sshpass -p '$ssh_user_pass' ssh $ssh_user@$ssh_host "$script_deploy_tainacan" skip_cleanup: true on: - branch: master + branch: master cache: directories: - vendor - composer notifications: - email: + email: on_success: never on_failure: always env: From 63b2fb9c46b98c34d74278ffc4abe2e945afd1da Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 28 May 2018 15:03:47 -0300 Subject: [PATCH 003/203] Update .travis.yml --- .travis.yml | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc8ef7e5c..14779389b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,41 +17,29 @@ apt: packages: - sshpass before_install: -#- openssl aes-256-cbc -K $encrypted_0a4ce2426081_key -iv $encrypted_0a4ce2426081_iv -# -in deploy_rsa.enc -out /tmp/deploy_rsa -d -#- openssl aes-256-cbc -K $encrypted_fb877661573d_key -iv $encrypted_fb877661573d_iv +#- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out deploy_rsa -d - sudo apt-get install sshpass -#- openssl aes-256-cbc -K $encrypted_0a4ce2426081_key -iv $encrypted_0a4ce2426081_iv - # -in deploy_rsa.enc -out deploy_rsa -d -#- eval "$(ssh-agent -s)" -#- chmod 600 /tmp/deploy_rsa -#- cat /tmp/deploy_rsa -#- ssh-add /tmp/deploy_rsa -#- echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config install: - echo -e "Install" script: phpunit --version -after_success: +after_success: - echo -e "After success!" before_deploy: -- openssl aes-256-cbc -K $encrypted_0a4ce2426081_key -iv $encrypted_0a4ce2426081_iv - -in deploy_rsa.enc -out /tmp/deploy_rsa -d +- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv + -in deploy_rsa.enc -out deploy_rsa -d - eval "$(ssh-agent -s)" - chmod 600 /tmp/deploy_rsa - ssh-add /tmp/deploy_rsa - echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config -#- ssh-add -- ssh-add -l -#- sshpass -p '$ssh_user_pass' ssh $ssh_user@$ssh_host "ls" -- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" -#- cat $ssh_user@$ssh_host $script_deploy_tainacan +- ssh-add -l +#- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" deploy: - provider: script - script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" #sshpass -p '$ssh_user_pass' ssh $ssh_user@$ssh_host "$script_deploy_tainacan" + script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" skip_cleanup: true on: - branch: master + branch: continuousintegration cache: directories: - vendor From 13b4b7f7a49fb3a29b2c825a94f58b9f602f6afe Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 28 May 2018 15:15:03 -0300 Subject: [PATCH 004/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 14779389b..7dcac3aef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ before_deploy: - ssh-add /tmp/deploy_rsa - echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config - ssh-add -l -#- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" +- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" deploy: - provider: script script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" From 9dd91dd5a2b9368a0fbef9bf7f8d69ab457a1c60 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 28 May 2018 15:20:38 -0300 Subject: [PATCH 005/203] Update .travis.yml --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7dcac3aef..140b045b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,11 +35,11 @@ before_deploy: - ssh-add -l - ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" deploy: -- provider: script - script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" - skip_cleanup: true - on: - branch: continuousintegration +#- provider: script + # script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" + # skip_cleanup: true + # on: + # branch: continuousintegration cache: directories: - vendor From 070b2ad612d08d7ba59996f2571375208f76592e Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 28 May 2018 15:23:04 -0300 Subject: [PATCH 006/203] Update .travis.yml --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 140b045b2..7dcac3aef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,11 +35,11 @@ before_deploy: - ssh-add -l - ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" deploy: -#- provider: script - # script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" - # skip_cleanup: true - # on: - # branch: continuousintegration +- provider: script + script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" + skip_cleanup: true + on: + branch: continuousintegration cache: directories: - vendor From 6b80ac791bd22b3a7140de0962588df5710cd68d Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 28 May 2018 15:25:55 -0300 Subject: [PATCH 007/203] Update .travis.yml --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7dcac3aef..0c3d47f73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,14 @@ install: script: phpunit --version after_success: - echo -e "After success!" +- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv + -in deploy_rsa.enc -out deploy_rsa -d +- eval "$(ssh-agent -s)" +- chmod 600 /tmp/deploy_rsa +- ssh-add /tmp/deploy_rsa +- echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config +- ssh-add -l +- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" before_deploy: - openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv -in deploy_rsa.enc -out deploy_rsa -d From c1d35f9068c4f472acaa8d858ecf7dddd0165691 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 28 May 2018 15:37:51 -0300 Subject: [PATCH 008/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0c3d47f73..12a800f3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ install: - echo -e "Install" script: phpunit --version after_success: -- echo -e "After success!" +- echo -e "After success!" #Alteração - openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv -in deploy_rsa.enc -out deploy_rsa -d - eval "$(ssh-agent -s)" From b627890a3c6825a64bb35e5c30d2cc99a30b78d7 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 28 May 2018 15:48:13 -0300 Subject: [PATCH 009/203] =?UTF-8?q?Integra=C3=A7=C3=A3o=20cont=C3=ADnua?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 10 ++++------ deploy_rsa.enc | Bin 3248 -> 3248 bytes 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 12a800f3a..5aa83c0e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ php: - 7.1 - hhvm - nightly -matrix: +matrix: allow_failures: - php: 7.1 - php: hhvm @@ -24,9 +24,9 @@ install: - echo -e "Install" script: phpunit --version after_success: -- echo -e "After success!" #Alteração - openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv -in deploy_rsa.enc -out deploy_rsa -d +- echo -e "After success!" - eval "$(ssh-agent -s)" - chmod 600 /tmp/deploy_rsa - ssh-add /tmp/deploy_rsa @@ -34,8 +34,6 @@ after_success: - ssh-add -l - ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" before_deploy: -- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv - -in deploy_rsa.enc -out deploy_rsa -d - eval "$(ssh-agent -s)" - chmod 600 /tmp/deploy_rsa - ssh-add /tmp/deploy_rsa @@ -47,13 +45,13 @@ deploy: script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" skip_cleanup: true on: - branch: continuousintegration + branch: continuousintegration cache: directories: - vendor - composer notifications: - email: + email: on_success: never on_failure: always env: diff --git a/deploy_rsa.enc b/deploy_rsa.enc index 6cf7d99e64f628b5e9b53438af6a020076bd55fe..4cc586d40a64489a232b948908d183fed96892e9 100644 GIT binary patch literal 3248 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 literal 3248 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 Date: Mon, 28 May 2018 16:12:23 -0300 Subject: [PATCH 010/203] =?UTF-8?q?Integra=C3=A7=C3=A3o=20cont=C3=ADnua?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 ++ deploy_rsa.enc | Bin 3248 -> 3248 bytes 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5aa83c0e9..cb5ce3ab2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,8 @@ script: phpunit --version after_success: - openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv -in deploy_rsa.enc -out deploy_rsa -d +#- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv +# -in deploy_rsa.enc -out deploy_rsa -d - echo -e "After success!" - eval "$(ssh-agent -s)" - chmod 600 /tmp/deploy_rsa diff --git a/deploy_rsa.enc b/deploy_rsa.enc index 4cc586d40a64489a232b948908d183fed96892e9..79323ba06489ea447a009867d8168d89e087612c 100644 GIT binary patch literal 3248 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 literal 3248 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 From 4573e72676c5ce9d340f5da007e45eed16fb5a5c Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 28 May 2018 16:16:24 -0300 Subject: [PATCH 011/203] =?UTF-8?q?Integra=C3=A7=C3=A3o=20cont=C3=ADnua?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cb5ce3ab2..439a7ea0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: script: phpunit --version after_success: - openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv - -in deploy_rsa.enc -out deploy_rsa -d + -in deploy_rsa.enc -out /tmp/deploy_rsa -d #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out deploy_rsa -d - echo -e "After success!" From cec31ae2c9a574ae68a25ddb6b9d909ac08a8251 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 09:13:00 -0300 Subject: [PATCH 012/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 439a7ea0b..17123e4ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ deploy: script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" skip_cleanup: true on: - branch: continuousintegration + branch: continuousintegration cache: directories: - vendor From 533ad0c143982b2ac56ddc90b88f346a0f10dc26 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 09:20:15 -0300 Subject: [PATCH 013/203] Update .travis.yml --- .travis.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17123e4ea..53c5dce82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,14 +34,15 @@ after_success: - ssh-add /tmp/deploy_rsa - echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config - ssh-add -l -- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" +#- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" before_deploy: -- eval "$(ssh-agent -s)" -- chmod 600 /tmp/deploy_rsa -- ssh-add /tmp/deploy_rsa -- echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config -- ssh-add -l -- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" +- echo "Seção executada antes do deploy!" +#- eval "$(ssh-agent -s)" +#- chmod 600 /tmp/deploy_rsa +#- ssh-add /tmp/deploy_rsa +#- echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config +#- ssh-add -l +#- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" deploy: - provider: script script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" From 4de826686a9041890ed967b5f92a6475f03998f2 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 09:25:16 -0300 Subject: [PATCH 014/203] Update .travis.yml --- .travis.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53c5dce82..1325c83c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,26 +23,28 @@ before_install: install: - echo -e "Install" script: phpunit --version -after_success: -- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv - -in deploy_rsa.enc -out /tmp/deploy_rsa -d +#after_success: +#- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv + # -in deploy_rsa.enc -out /tmp/deploy_rsa -d #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out deploy_rsa -d -- echo -e "After success!" -- eval "$(ssh-agent -s)" -- chmod 600 /tmp/deploy_rsa -- ssh-add /tmp/deploy_rsa -- echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config -- ssh-add -l -#- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" -before_deploy: -- echo "Seção executada antes do deploy!" +#- echo -e "After success!" #- eval "$(ssh-agent -s)" #- chmod 600 /tmp/deploy_rsa #- ssh-add /tmp/deploy_rsa #- echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config #- ssh-add -l #- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" +before_deploy: +- echo "Seção executada antes do deploy!" +- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv + -in deploy_rsa.enc -out /tmp/deploy_rsa -d +- eval "$(ssh-agent -s)" +- chmod 600 /tmp/deploy_rsa +- ssh-add /tmp/deploy_rsa +- echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config +- ssh-add -l +#- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" deploy: - provider: script script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" From 73ebcd1e406443d0043a8bb9fdcfcd35c9d460c8 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 09:28:37 -0300 Subject: [PATCH 015/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1325c83c8..266c287b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ before_deploy: #- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" deploy: - provider: script - script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" + script: ssh $ssh_user@$ssh_host "$script_deploy_tainacan" #"sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" skip_cleanup: true on: branch: continuousintegration From 4b8ee4e0fc6fe6d72c514656f3e618d4d2873085 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 09:33:02 -0300 Subject: [PATCH 016/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 266c287b2..1325c83c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ before_deploy: #- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" deploy: - provider: script - script: ssh $ssh_user@$ssh_host "$script_deploy_tainacan" #"sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" + script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" skip_cleanup: true on: branch: continuousintegration From 38b5899d607132c75e0b3f6798caa2c0a78c6c9a Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 09:38:17 -0300 Subject: [PATCH 017/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1325c83c8..28d1b2819 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_install: - sudo apt-get install sshpass install: - echo -e "Install" -script: phpunit --version +script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out /tmp/deploy_rsa -d From 36f95d142397de17c0b6a6435521b95cca0bc6ef Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 09:55:42 -0300 Subject: [PATCH 018/203] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28d1b2819..f0aaaf66e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_install: - sudo apt-get install sshpass install: - echo -e "Install" -script: phpunit #--version +script: run-tests.sh #phpunit --version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out /tmp/deploy_rsa -d @@ -47,7 +47,7 @@ before_deploy: #- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" deploy: - provider: script - script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" + script: echo "Faz Deploy!"#ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" skip_cleanup: true on: branch: continuousintegration From d2cf3b5326d99b3f32ae71f4f29064e049376795 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 10:00:44 -0300 Subject: [PATCH 019/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f0aaaf66e..4c46a6b59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_install: - sudo apt-get install sshpass install: - echo -e "Install" -script: run-tests.sh #phpunit --version +script: sh run-tests.sh #phpunit --version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out /tmp/deploy_rsa -d From 71fcde2b977b674fef8e43893868365b1283b5aa Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 10:13:34 -0300 Subject: [PATCH 020/203] Update and rename bootstrap-config-sample.php to bootstrap-config.php --- tests/{bootstrap-config-sample.php => bootstrap-config.php} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename tests/{bootstrap-config-sample.php => bootstrap-config.php} (93%) diff --git a/tests/bootstrap-config-sample.php b/tests/bootstrap-config.php similarity index 93% rename from tests/bootstrap-config-sample.php rename to tests/bootstrap-config.php index cfb8a21bf..079cf01bc 100644 --- a/tests/bootstrap-config-sample.php +++ b/tests/bootstrap-config.php @@ -4,4 +4,5 @@ return [ 'tests_dir' => '/tmp/wordpress-tests-lib', ]; - ?> \ No newline at end of file + + ?> From 88e0eae84012919f785e87606075a01ee045165c Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 10:21:55 -0300 Subject: [PATCH 021/203] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4c46a6b59..7ae41946a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,8 @@ before_install: - sudo apt-get install sshpass install: - echo -e "Install" +- mkdir /tmp/wordpress +- sh tests/bin/install-wp-tests.sh wordpress_test root root /tmp/wordpress localhost latest script: sh run-tests.sh #phpunit --version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From d8abbb73401493cf8a8bd2b93168cf23fdc38c71 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 13:00:44 -0300 Subject: [PATCH 022/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ae41946a..4d9e6d0b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: install: - echo -e "Install" - mkdir /tmp/wordpress -- sh tests/bin/install-wp-tests.sh wordpress_test root root /tmp/wordpress localhost latest +#- sh tests/bin/install-wp-tests.sh wordpress_test root root /tmp/wordpress localhost latest script: sh run-tests.sh #phpunit --version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From a50c922fade843d69b92b66a54677c62e5acdc73 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 13:01:37 -0300 Subject: [PATCH 023/203] Update bootstrap-config.php --- tests/bootstrap-config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bootstrap-config.php b/tests/bootstrap-config.php index 079cf01bc..f92c5a7e1 100644 --- a/tests/bootstrap-config.php +++ b/tests/bootstrap-config.php @@ -1,7 +1,7 @@ '/tmp/wordpress-tests-lib', + 'tests_dir' => ' /tmp/wordpress', ]; From 00ac028c2367fcf7ccacd7e36a3960a23211faf0 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 13:45:33 -0300 Subject: [PATCH 024/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4d9e6d0b5..764ba8500 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: install: - echo -e "Install" - mkdir /tmp/wordpress -#- sh tests/bin/install-wp-tests.sh wordpress_test root root /tmp/wordpress localhost latest +- sh tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /tmp/wordpress medialab.ufg.br latest script: sh run-tests.sh #phpunit --version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 0b223c2d6e4b437f1ab6df7085c0f323e58a1e64 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 13:46:23 -0300 Subject: [PATCH 025/203] Update bootstrap-config.php --- tests/bootstrap-config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bootstrap-config.php b/tests/bootstrap-config.php index f92c5a7e1..009a97175 100644 --- a/tests/bootstrap-config.php +++ b/tests/bootstrap-config.php @@ -1,7 +1,7 @@ ' /tmp/wordpress', + 'tests_dir' => ' /tmp/wordpress/wodpress-tests-lib', ]; From 5787838004175a456f001358affbe1a43eb98fa8 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 13:49:58 -0300 Subject: [PATCH 026/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 764ba8500..5631f9dc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: install: - echo -e "Install" - mkdir /tmp/wordpress -- sh tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /tmp/wordpress medialab.ufg.br latest +- sh tests/bin/install-wp-tests.sh "c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /tmp/wordpress medialab.ufg.br latest" script: sh run-tests.sh #phpunit --version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 6d139d2671767b87aab69aa7c58ec919abea3499 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 13:51:51 -0300 Subject: [PATCH 027/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5631f9dc7..9c317bb9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: install: - echo -e "Install" - mkdir /tmp/wordpress -- sh tests/bin/install-wp-tests.sh "c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /tmp/wordpress medialab.ufg.br latest" +#- sh tests/bin/install-wp-tests.sh "c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /tmp/wordpress medialab.ufg.br latest" script: sh run-tests.sh #phpunit --version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 343deba3e98a346d53cd70b35134d615a585443d Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 14:04:46 -0300 Subject: [PATCH 028/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c317bb9b..1edb0a358 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ install: - echo -e "Install" - mkdir /tmp/wordpress #- sh tests/bin/install-wp-tests.sh "c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /tmp/wordpress medialab.ufg.br latest" -script: sh run-tests.sh #phpunit --version +script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out /tmp/deploy_rsa -d From bf46dc56e72ad1a20671af2108515de7190aa0e6 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 14:47:02 -0300 Subject: [PATCH 029/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1edb0a358..9b8e9574f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: install: - echo -e "Install" - mkdir /tmp/wordpress -#- sh tests/bin/install-wp-tests.sh "c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /tmp/wordpress medialab.ufg.br latest" +- sh tests/bin/install-wp-tests.sh "c1_phpunit" "c1_phpunit_test" "6NrE59YsZpHoRHIi" "/tmp/wordpress" "medialab.ufg.br" "latest" "true" script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From d331c73554fce8398a4808da961d484dd46457f8 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 14:49:05 -0300 Subject: [PATCH 030/203] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9b8e9574f..b241fb6e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,8 @@ before_install: install: - echo -e "Install" - mkdir /tmp/wordpress -- sh tests/bin/install-wp-tests.sh "c1_phpunit" "c1_phpunit_test" "6NrE59YsZpHoRHIi" "/tmp/wordpress" "medialab.ufg.br" "latest" "true" +- pwd +#- sh tests/bin/install-wp-tests.sh "c1_phpunit" "c1_phpunit_test" "6NrE59YsZpHoRHIi" "/tmp/wordpress" "medialab.ufg.br" "latest" "true" script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 49b8755b74d1f45a640cf39f028e7f8f126b5e49 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 14:52:33 -0300 Subject: [PATCH 031/203] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b241fb6e8..39db7abac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,7 @@ before_install: install: - echo -e "Install" - mkdir /tmp/wordpress -- pwd -#- sh tests/bin/install-wp-tests.sh "c1_phpunit" "c1_phpunit_test" "6NrE59YsZpHoRHIi" "/tmp/wordpress" "medialab.ufg.br" "latest" "true" +- sudo sh tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /tmp/wordpress medialab.ufg.br latest true script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From c11cdc1f7ee4595807ae51c2795114fda4bf6009 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 14:56:21 -0300 Subject: [PATCH 032/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 39db7abac..73a49d6c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: install: - echo -e "Install" - mkdir /tmp/wordpress -- sudo sh tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /tmp/wordpress medialab.ufg.br latest true +- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /tmp/wordpress medialab.ufg.br latest true script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 8a4d339e9cd97d152b98c0fbebf3e79f81219580 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 15:12:41 -0300 Subject: [PATCH 033/203] Update bootstrap-config.php --- tests/bootstrap-config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bootstrap-config.php b/tests/bootstrap-config.php index 009a97175..6517be2a0 100644 --- a/tests/bootstrap-config.php +++ b/tests/bootstrap-config.php @@ -1,7 +1,7 @@ ' /tmp/wordpress/wodpress-tests-lib', + 'tests_dir' => '/tmp/wordpress/wodpress-tests-lib', ]; From 5e97b3e74564f61c65cff7b105e856a88a09a973 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 15:16:10 -0300 Subject: [PATCH 034/203] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 73a49d6c5..28249d07c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,8 @@ before_install: - sudo apt-get install sshpass install: - echo -e "Install" -- mkdir /tmp/wordpress -- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /tmp/wordpress medialab.ufg.br latest true +- mkdir ~/wordpress +- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi ~/wordpress medialab.ufg.br latest true script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 2e5235ff7b49acbd33abcad3e9e7b0962ca8e8fc Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 15:16:47 -0300 Subject: [PATCH 035/203] Update bootstrap-config.php --- tests/bootstrap-config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bootstrap-config.php b/tests/bootstrap-config.php index 6517be2a0..bc70a4594 100644 --- a/tests/bootstrap-config.php +++ b/tests/bootstrap-config.php @@ -1,7 +1,7 @@ '/tmp/wordpress/wodpress-tests-lib', + 'tests_dir' => '~/wordpress/wodpress-tests-lib', ]; From 2a0a91c2c9f91eca6cefadd58b3862836efae6ab Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 15:19:27 -0300 Subject: [PATCH 036/203] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28249d07c..ec7489689 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,8 @@ before_install: - sudo apt-get install sshpass install: - echo -e "Install" -- mkdir ~/wordpress -- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi ~/wordpress medialab.ufg.br latest true +- mkdir /home/travis/wordpress +- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/wordpress medialab.ufg.br latest true script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 9ae7cac4bbcef5437baa7c7a4fa753e77a7ddb33 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 15:20:07 -0300 Subject: [PATCH 037/203] Update bootstrap-config.php --- tests/bootstrap-config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bootstrap-config.php b/tests/bootstrap-config.php index bc70a4594..fa69055dd 100644 --- a/tests/bootstrap-config.php +++ b/tests/bootstrap-config.php @@ -1,7 +1,7 @@ '~/wordpress/wodpress-tests-lib', + 'tests_dir' => '/home/travis/wordpress/wodpress-tests-lib', ]; From 9394199bb6cf664d08c61a824b76caebdcfed895 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 15:26:21 -0300 Subject: [PATCH 038/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ec7489689..9f29e31bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ php: - 7.1 - hhvm - nightly -matrix: +matrix: allow_failures: - php: 7.1 - php: hhvm From 0616d7a2d8708bb1a07bdb7d091e34b7f70f764e Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 15:45:08 -0300 Subject: [PATCH 039/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9f29e31bf..62105192d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ apt: before_install: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out deploy_rsa -d -- sudo apt-get install sshpass +- sudo apt-get install sshpass install: - echo -e "Install" - mkdir /home/travis/wordpress From 23864b6a853fcf59796dba8c5837191e5c9b579a Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 15:59:22 -0300 Subject: [PATCH 040/203] Update bootstrap-config.php --- tests/bootstrap-config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bootstrap-config.php b/tests/bootstrap-config.php index fa69055dd..23993b621 100644 --- a/tests/bootstrap-config.php +++ b/tests/bootstrap-config.php @@ -1,7 +1,7 @@ '/home/travis/wordpress/wodpress-tests-lib', + 'tests_dir' => '/home/travis/build/wordpress/wodpress-tests-lib', ]; From 0886d9e454cbdc4824ca429d7f55008f77d83336 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 15:59:52 -0300 Subject: [PATCH 041/203] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62105192d..466d426bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,8 @@ before_install: - sudo apt-get install sshpass install: - echo -e "Install" -- mkdir /home/travis/wordpress -- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/wordpress medialab.ufg.br latest true +- mkdir /home/travis/build/wordpress/ +- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress/ medialab.ufg.br latest true script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From b3b679b9fbfde8eef0fd0fa1bb56005b897f0415 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 16:12:51 -0300 Subject: [PATCH 042/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 466d426bf..b7a9894fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: install: - echo -e "Install" - mkdir /home/travis/build/wordpress/ -- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress/ medialab.ufg.br latest true +- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress/ medialab.ufg.br latest false script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 773eadbb0499a387e06f732a1a287d8cda9e06fe Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 16:16:58 -0300 Subject: [PATCH 043/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b7a9894fd..466d426bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: install: - echo -e "Install" - mkdir /home/travis/build/wordpress/ -- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress/ medialab.ufg.br latest false +- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress/ medialab.ufg.br latest true script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 19483fba9d777f27904e2fdc454b9bee7a50048e Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 29 May 2018 16:25:53 -0300 Subject: [PATCH 044/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 466d426bf..7142099fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: install: - echo -e "Install" - mkdir /home/travis/build/wordpress/ -- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress/ medialab.ufg.br latest true +- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress/ medialab.ufg.br latest script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 7c9b924b5d830e45505be5719dfbb5e6ee5edae3 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Wed, 30 May 2018 08:51:42 -0300 Subject: [PATCH 045/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7142099fe..466d426bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: install: - echo -e "Install" - mkdir /home/travis/build/wordpress/ -- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress/ medialab.ufg.br latest +- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress/ medialab.ufg.br latest true script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 32a20dedf95ae2f2036c97b49756dc3630dd9879 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Wed, 30 May 2018 09:28:43 -0300 Subject: [PATCH 046/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 466d426bf..9bd3a093d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: install: - echo -e "Install" - mkdir /home/travis/build/wordpress/ -- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress/ medialab.ufg.br latest true +- sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress medialab.ufg.br latest true script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 17969892d36a35ad808551221115d886fd5af67b Mon Sep 17 00:00:00 2001 From: walisonjose Date: Wed, 30 May 2018 13:45:30 -0300 Subject: [PATCH 047/203] Update .travis.yml --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9bd3a093d..32a70b709 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,11 +19,20 @@ apt: before_install: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out deploy_rsa -d +#Instalando Mysql - sudo apt-get install sshpass +- apt-get -y install zsh htop +- echo "mysql-server-5.6 mysql-server/root_password password root" | sudo debconf-set-selections +- echo "mysql-server-5.6 mysql-server/root_password_again password root" | sudo debconf-set-selections +- apt-get -y install mysql-server-5.6 +- mysql_secure_installation +- sed -i 's/127\.0\.0\.1/0\.0\.0\.0/g' /etc/mysql/my.cnf +- mysql -uroot -p -e 'USE mysql; UPDATE `user` SET `Host`="%" WHERE `User`="root" AND `Host`="localhost"; DELETE FROM `user` WHERE `Host` != "%" AND `User`="root"; FLUSH PRIVILEGES;' install: - echo -e "Install" - mkdir /home/travis/build/wordpress/ - sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress medialab.ufg.br latest true +- service mysql restart script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From baa970438ce51695f5922449ce6586e485f6e9db Mon Sep 17 00:00:00 2001 From: walisonjose Date: Wed, 30 May 2018 13:48:12 -0300 Subject: [PATCH 048/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 32a70b709..476fa97c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: # -in deploy_rsa.enc -out deploy_rsa -d #Instalando Mysql - sudo apt-get install sshpass -- apt-get -y install zsh htop +- sudo apt-get -y install zsh htop - echo "mysql-server-5.6 mysql-server/root_password password root" | sudo debconf-set-selections - echo "mysql-server-5.6 mysql-server/root_password_again password root" | sudo debconf-set-selections - apt-get -y install mysql-server-5.6 From e421b3e680f6a0ba350b5eca9557bf3335a1cb11 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Wed, 30 May 2018 13:50:51 -0300 Subject: [PATCH 049/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 476fa97c2..4d68b43d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ before_install: - sudo apt-get -y install zsh htop - echo "mysql-server-5.6 mysql-server/root_password password root" | sudo debconf-set-selections - echo "mysql-server-5.6 mysql-server/root_password_again password root" | sudo debconf-set-selections -- apt-get -y install mysql-server-5.6 +- sudo apt-get -y install mysql-server-5.6 - mysql_secure_installation - sed -i 's/127\.0\.0\.1/0\.0\.0\.0/g' /etc/mysql/my.cnf - mysql -uroot -p -e 'USE mysql; UPDATE `user` SET `Host`="%" WHERE `User`="root" AND `Host`="localhost"; DELETE FROM `user` WHERE `Host` != "%" AND `User`="root"; FLUSH PRIVILEGES;' From cbdfeaad79cd9d3da36d733d572e02a7de0391dd Mon Sep 17 00:00:00 2001 From: walisonjose Date: Wed, 30 May 2018 14:03:31 -0300 Subject: [PATCH 050/203] Update .travis.yml --- .travis.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d68b43d2..c4b826c24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,18 +16,21 @@ addons: apt: packages: - sshpass + services: +- mysql before_install: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out deploy_rsa -d #Instalando Mysql -- sudo apt-get install sshpass -- sudo apt-get -y install zsh htop -- echo "mysql-server-5.6 mysql-server/root_password password root" | sudo debconf-set-selections -- echo "mysql-server-5.6 mysql-server/root_password_again password root" | sudo debconf-set-selections -- sudo apt-get -y install mysql-server-5.6 -- mysql_secure_installation -- sed -i 's/127\.0\.0\.1/0\.0\.0\.0/g' /etc/mysql/my.cnf -- mysql -uroot -p -e 'USE mysql; UPDATE `user` SET `Host`="%" WHERE `User`="root" AND `Host`="localhost"; DELETE FROM `user` WHERE `Host` != "%" AND `User`="root"; FLUSH PRIVILEGES;' +- sudo apt-get install sshpass +- mysql +#- sudo apt-get -y install zsh htop +#- echo "mysql-server-5.6 mysql-server/root_password password root" | sudo debconf-set-selections +#- echo "mysql-server-5.6 mysql-server/root_password_again password root" | sudo debconf-set-selections +#- sudo apt-get -y install mysql-server-5.6 +#- mysql_secure_installation +#- sed -i 's/127\.0\.0\.1/0\.0\.0\.0/g' /etc/mysql/my.cnf +#- mysql -uroot -p -e 'USE mysql; UPDATE `user` SET `Host`="%" WHERE `User`="root" AND `Host`="localhost"; DELETE FROM `user` WHERE `Host` != "%" AND `User`="root"; FLUSH PRIVILEGES;' install: - echo -e "Install" - mkdir /home/travis/build/wordpress/ From bb2dfd0105e1dc3036ba92260ba79b1d91a35b07 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Wed, 30 May 2018 14:08:33 -0300 Subject: [PATCH 051/203] Update .travis.yml --- .travis.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4b826c24..39ff120f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,14 +23,10 @@ before_install: # -in deploy_rsa.enc -out deploy_rsa -d #Instalando Mysql - sudo apt-get install sshpass -- mysql -#- sudo apt-get -y install zsh htop -#- echo "mysql-server-5.6 mysql-server/root_password password root" | sudo debconf-set-selections -#- echo "mysql-server-5.6 mysql-server/root_password_again password root" | sudo debconf-set-selections -#- sudo apt-get -y install mysql-server-5.6 -#- mysql_secure_installation -#- sed -i 's/127\.0\.0\.1/0\.0\.0\.0/g' /etc/mysql/my.cnf -#- mysql -uroot -p -e 'USE mysql; UPDATE `user` SET `Host`="%" WHERE `User`="root" AND `Host`="localhost"; DELETE FROM `user` WHERE `Host` != "%" AND `User`="root"; FLUSH PRIVILEGES;' +- sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('root') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;" +- sudo mysql_upgrade +- sudo service mysql restart +- sudo mysql -u root -p 'root' install: - echo -e "Install" - mkdir /home/travis/build/wordpress/ From c67f0a72850b50ce4cf23ffd77b16030beb062ba Mon Sep 17 00:00:00 2001 From: walisonjose Date: Wed, 30 May 2018 14:10:27 -0300 Subject: [PATCH 052/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 39ff120f5..4be2a57f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ install: - echo -e "Install" - mkdir /home/travis/build/wordpress/ - sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress medialab.ufg.br latest true -- service mysql restart +- service mysql restart script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From c1a16a0e1035a574d5972520ffc6aaa919c63bc5 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Wed, 30 May 2018 14:19:18 -0300 Subject: [PATCH 053/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4be2a57f9..7130359f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ addons: - ssh_know_hosts: - "$ssh_host" apt: - packages: + packages: - sshpass services: - mysql From 5ae22924579cf0b38c0136e7d41e685e8462a8ee Mon Sep 17 00:00:00 2001 From: walisonjose Date: Wed, 30 May 2018 14:22:04 -0300 Subject: [PATCH 054/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7130359f2..06994ccd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ install: - echo -e "Install" - mkdir /home/travis/build/wordpress/ - sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress medialab.ufg.br latest true -- service mysql restart +- service mysql restart script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 2b20873fcd27fa0bacb2c68179efe676b0eae0b5 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Wed, 30 May 2018 14:26:21 -0300 Subject: [PATCH 055/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 06994ccd9..7130359f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ install: - echo -e "Install" - mkdir /home/travis/build/wordpress/ - sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress medialab.ufg.br latest true -- service mysql restart +- service mysql restart script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From d46c75e76ffc5b06f3849e294cea489d7a4d56d0 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Wed, 30 May 2018 14:30:10 -0300 Subject: [PATCH 056/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7130359f2..e889cee4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ before_install: - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('root') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;" - sudo mysql_upgrade - sudo service mysql restart -- sudo mysql -u root -p 'root' +- sudo mysql -u root -p 'root' install: - echo -e "Install" - mkdir /home/travis/build/wordpress/ From c3a4de5e77be3af40944c7ad30b9c900c2548df8 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Wed, 30 May 2018 15:02:32 -0300 Subject: [PATCH 057/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e889cee4f..5c90835c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ install: - echo -e "Install" - mkdir /home/travis/build/wordpress/ - sudo ./tests/bin/install-wp-tests.sh c1_phpunit c1_phpunit_test 6NrE59YsZpHoRHIi /home/travis/build/wordpress medialab.ufg.br latest true -- service mysql restart +- service mysql restart script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv From 8cb4d0061ebe6f526a6333e9c5481abf1538f1ba Mon Sep 17 00:00:00 2001 From: Leo Germani Date: Wed, 30 May 2018 12:06:45 -0300 Subject: [PATCH 058/203] improves get_metadata_html --- src/classes/entities/class-tainacan-item.php | 110 ++++++++++++++++--- src/theme-helper/template-tags.php | 44 +++++--- 2 files changed, 119 insertions(+), 35 deletions(-) diff --git a/src/classes/entities/class-tainacan-item.php b/src/classes/entities/class-tainacan-item.php index 3e355ed57..c0fec0896 100644 --- a/src/classes/entities/class-tainacan-item.php +++ b/src/classes/entities/class-tainacan-item.php @@ -454,26 +454,37 @@ class Item extends Entity { * If an ID, a slug or a Tainacan\Entities\Field object is passed, it returns only one metadata, otherwise * it returns all metadata * - * @param int|string|Tainacan\Entities\Field $field Field object, ID or slug to retrieve only one field. empty returns all fields - * @param array|string $args { - * Optional. Array or string of arguments. - * - * @type bool $hide_empty Wether to hide or not fields the item has no value to - * Default: true - * @type string $before_title String to be added before each metadata title - * Default '

' - * @type string $after_title String to be added after each metadata title - * Default '

' - * @type string $before_value String to be added before each metadata value - * Default '

' - * @type string $after_value String to be added after each metadata value - * Default '

' - * } + * @param array|string $args { + * Optional. Array or string of arguments. + * + * @type mixed $metadata Field object, ID or slug to retrieve only one field. empty returns all metadata + * + * @type array $metadata__in Array of metadata IDs or Slugs to be retrieved. Default none + * + * @type array $metadata__not_in Array of metadata IDs (slugs not accepted) to excluded. Default none + * + * @type bool $exclude_title Exclude the Core Title Metadata from result. Default false + * + * @type bool $exclude_description Exclude the Core Description Metadata from result. Default false + * + * @type bool $exclude_core Exclude Core Metadata (title and description) from result. Default false + * + * @type bool $hide_empty Wether to hide or not fields the item has no value to + * Default: true + * @type string $before_title String to be added before each metadata title + * Default '

' + * @type string $after_title String to be added after each metadata title + * Default '

' + * @type string $before_value String to be added before each metadata value + * Default '

' + * @type string $after_value String to be added after each metadata value + * Default '

' + * } * * @return string The HTML output * @throws \Exception */ - public function get_metadata_as_html($field = null, $args = array()) { + public function get_metadata_as_html($args = array()) { $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance(); $Tainacan_Fields = \Tainacan\Repositories\Fields::get_instance(); @@ -481,6 +492,12 @@ class Item extends Entity { $return = ''; $defaults = array( + 'metadata' => null, + 'metadata__in' => null, + 'metadata__not_in' => null, + 'exclude_title' => false, + 'exclude_description' => false, + 'exclude_core' => false, 'hide_empty' => true, 'before_title' => '

', 'after_title' => '

', @@ -489,7 +506,7 @@ class Item extends Entity { ); $args = wp_parse_args($args, $defaults); - if (!is_null($field)) { + if (!is_null($args['metadata'])) { $field_object = null; @@ -505,6 +522,16 @@ class Item extends Entity { } if ( $field_object instanceof \Tainacan\Entities\Field ) { + + if ( is_array($args['metadata__not_in']) + && ( + in_array($field_object->get_slug(), $args['metadata__not_in']) || + in_array($field_object->get_id(), $args['metadata__not_in']) + ) + ) { + return $return; + } + $item_meta = new \Tainacan\Entities\Item_Metadata_Entity($this, $field_object); if ($item_meta->has_value() || !$args['hide_empty']) { $return .= $args['before_title'] . $field_object->get_name() . $args['after_title']; @@ -516,10 +543,57 @@ class Item extends Entity { return $return; } + + + + $query_args = []; + $post__in = []; + $post__not_in = []; + $post__name_in = []; + if (is_array($args['metadata__in'])) { + foreach ($args['metadata__in'] as $meta) { + if (is_string($meta)) { + $post__name_in[] = $meta; + } elseif (is_integer($meta)) { + $post__in[] = $meta; + } + } + } + if (is_array($args['metadata__not_in'])) { + foreach ($args['metadata__not_in'] as $meta) { + if (is_integer($meta)) { + $post__not_in[] = $meta; + } + } + } + + if (sizeof($post__in) > 0) { + $query_args['post__in'] = $post__in; + } + if (sizeof($post__not_in) > 0) { + $query_args['post__not_in'] = $post__not_in; + } + if (sizeof($post__name_in) > 0) { + $query_args['post__name_in'] = $post__name_in; + } + - $fields = $this->get_fields(); + $fields = $this->get_fields($query_args); foreach ( $fields as $item_meta ) { + + $fto = $item_meta->get_field()->get_field_type_object(); + + if ( $fto->get_core() ) { + if ( $args['exclude_core'] ) { + continue; + } elseif ( $args['exclude_title'] && $fto->get_related_mapped_prop() == 'title' ) { + continue; + } elseif ( $args['exclude_description'] && $fto->get_related_mapped_prop() == 'description' ) { + continue; + } + } + if ($item_meta->has_value() || !$args['hide_empty']) { $return .= $args['before_title'] . $item_meta->get_field()->get_name() . $args['after_title']; $return .= $args['before_value'] . $item_meta->get_value_as_html() . $args['after_value']; diff --git a/src/theme-helper/template-tags.php b/src/theme-helper/template-tags.php index b0026501b..dc307409d 100644 --- a/src/theme-helper/template-tags.php +++ b/src/theme-helper/template-tags.php @@ -13,25 +13,35 @@ use \Tainacan\Repositories; * If an ID, a slug or a Tainacan\Entities\Field object is passed, it returns only one metadata, otherwise * it returns all metadata * - * @param int|string|Tainacan\Entities\Field $field Field object, ID or slug to retrieve only one field. empty returns all fields - * @param array|string $args * @param array|string $args { - * Optional. Array or string of arguments. - * - * @type bool $hide_empty Wether to hide or not fields the item has no value to - * Default: true - * @type string $before_title String to be added before each metadata title - * Default '

' - * @type string $after_title String to be added after each metadata title - * Default '

' - * @type string $before_value String to be added before each metadata value - * Default '

' - * @type string $after_value String to be added after each metadata value - * Default '

' - * } + * Optional. Array or string of arguments. + * + * @type mixed $metadata Field object, ID or slug to retrieve only one field. empty returns all metadata + * + * @type array $metadata__in Array of metadata IDs or Slugs to be retrieved. Default none + * + * @type array $metadata__not_in Array of metadata IDs (slugs not accepted) to excluded. Default none + * + * @type bool $exclude_title Exclude the Core Title Metadata from result. Default false + * + * @type bool $exclude_description Exclude the Core Description Metadata from result. Default false + * + * @type bool $exclude_core Exclude Core Metadata (title and description) from result. Default false + * + * @type bool $hide_empty Wether to hide or not fields the item has no value to + * Default: true + * @type string $before_title String to be added before each metadata title + * Default '

' + * @type string $after_title String to be added after each metadata title + * Default '

' + * @type string $before_value String to be added before each metadata value + * Default '

' + * @type string $after_value String to be added after each metadata value + * Default '

' + * } * @return string The HTML output */ -function tainacan_get_the_metadata($field = null, $args = array()) { +function tainacan_get_the_metadata($args = array()) { $post = get_post(); $theme_helper = \Tainacan\Theme_Helper::get_instance(); @@ -40,7 +50,7 @@ function tainacan_get_the_metadata($field = null, $args = array()) { $item = new Entities\Item($post); - return $item->get_metadata_as_html($field, $args); + return $item->get_metadata_as_html($args); } From 5d2a9f27adb0471f26a269573dc85111faf05597 Mon Sep 17 00:00:00 2001 From: Leo Germani Date: Wed, 30 May 2018 15:41:35 -0300 Subject: [PATCH 059/203] add fetch_one method to repository --- .../class-tainacan-repository.php | 25 +++++++++++ tests/test-objects.php | 43 ++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/src/classes/repositories/class-tainacan-repository.php b/src/classes/repositories/class-tainacan-repository.php index 8126b205a..94092409e 100644 --- a/src/classes/repositories/class-tainacan-repository.php +++ b/src/classes/repositories/class-tainacan-repository.php @@ -510,6 +510,31 @@ abstract class Repository { return false; } + /** + * Fetch one Entity based on query args. + * + * Note: Does not work with Item_Metadata Repository + * + * @param array $args Query Args as expected by fetch + * + * @return false|\Tainacan\Entities The entity or false if none was found + */ + public function fetch_one($args) { + if ($this->get_name() == 'Item_Metadata') { + return false; + } + + $args['posts_per_page'] = 1; + + $results = $this->fetch($args, 'OBJECT'); + + if (is_array($results) && sizeof($results) > 0 && $results[0] instanceof \Tainacan\Entities\Entity) { + return $results[0]; + } + + return false; + } + /** * @param $object * diff --git a/tests/test-objects.php b/tests/test-objects.php index 2aece06ba..c0efc3a0e 100644 --- a/tests/test-objects.php +++ b/tests/test-objects.php @@ -131,5 +131,46 @@ class Objects extends TAINACAN_UnitTestCase { $this->assertEquals('', $newCol->get_name()); - } + } + + function test_fetch_one() { + + + $collection = $this->tainacan_entity_factory->create_entity( + 'collection', + array( + 'name' => 'teste', + 'status' => 'publish' + ), + true + ); + + $collection2 = $this->tainacan_entity_factory->create_entity( + 'collection', + array( + 'name' => 'teste2', + 'status' => 'publish' + ), + true + ); + + $collection3 = $this->tainacan_entity_factory->create_entity( + 'collection', + array( + 'name' => 'teste3', + 'status' => 'publish' + ), + true + ); + + + + $Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance(); + + $one = $Tainacan_Collections->fetch_one(['name' => 'teste2']); + + $this->assertTrue( $one instanceof \Tainacan\Entities\Collection ); + $this->assertEquals( 'teste2', $one->get_name() ); + + } } From 02527eef4972ec185ad014f2d0e0b892187e0d6c Mon Sep 17 00:00:00 2001 From: Leo Germani Date: Wed, 30 May 2018 15:44:29 -0300 Subject: [PATCH 060/203] adds more methods to find core fields --- .../entities/class-tainacan-collection.php | 67 +++++++++++++++++++ src/classes/entities/class-tainacan-item.php | 2 +- src/theme-helper/template-tags.php | 2 +- tests/test-core-field-types.php | 41 ++++++++++++ 4 files changed, 110 insertions(+), 2 deletions(-) diff --git a/src/classes/entities/class-tainacan-collection.php b/src/classes/entities/class-tainacan-collection.php index a0567e856..599a5345e 100644 --- a/src/classes/entities/class-tainacan-collection.php +++ b/src/classes/entities/class-tainacan-collection.php @@ -454,6 +454,73 @@ class Collection extends Entity { return $Tainacan_Fields->fetch_by_collection( $this, [], 'OBJECT' ); } + /** + * Get the two core fields of the collection (title and description) + * + * @return array[\Tainacan\Entities\Field] + */ + function get_core_fields() { + $repo = \Tainacan\Repositories\Fields::get_instance(); + + return $repo->fetch_by_collection($this, [ + 'meta_query' => [ + [ + 'key' => 'field_type', + 'value' => ['Tainacan\Field_Types\Core_Title', 'Tainacan\Field_Types\Core_Description'], + 'compare' => 'IN' + ] + ] + ], 'OBJECT'); + } + + /** + * Get the Core Title Field for this collection + * + * @return \Tainacan\Entities\Field The Core Title Field + */ + function get_core_title_field() { + $repo = \Tainacan\Repositories\Fields::get_instance(); + + $results = $repo->fetch_by_collection($this, [ + 'meta_query' => [ + [ + 'key' => 'field_type', + 'value' => 'Tainacan\Field_Types\Core_Title', + ] + ], + 'posts_per_page' => 1 + ], 'OBJECT'); + + if (is_array($results) && sizeof($results) == 1 && $results[0] instanceof \Tainacan\Entities\Field) { + return $results[0]; + } + return false; + } + + /** + * Get the Core Description Field for this collection + * + * @return \Tainacan\Entities\Field The Core Description Field + */ + function get_core_description_field() { + $repo = \Tainacan\Repositories\Fields::get_instance(); + + $results = $repo->fetch_by_collection($this, [ + 'meta_query' => [ + [ + 'key' => 'field_type', + 'value' => 'Tainacan\Field_Types\Core_Description', + ] + ], + 'posts_per_page' => 1 + ], 'OBJECT'); + + if (is_array($results) && sizeof($results) == 1 && $results[0] instanceof \Tainacan\Entities\Field) { + return $results[0]; + } + return false; + } + /** * Set the collection name * diff --git a/src/classes/entities/class-tainacan-item.php b/src/classes/entities/class-tainacan-item.php index c0fec0896..3d999f9af 100644 --- a/src/classes/entities/class-tainacan-item.php +++ b/src/classes/entities/class-tainacan-item.php @@ -451,7 +451,7 @@ class Item extends Entity { * * Each metadata is a label with the field name and the value. * - * If an ID, a slug or a Tainacan\Entities\Field object is passed, it returns only one metadata, otherwise + * If an ID, a slug or a Tainacan\Entities\Field object is passed in the 'metadata' argument, it returns only one metadata, otherwise * it returns all metadata * * @param array|string $args { diff --git a/src/theme-helper/template-tags.php b/src/theme-helper/template-tags.php index dc307409d..f684b9cc4 100644 --- a/src/theme-helper/template-tags.php +++ b/src/theme-helper/template-tags.php @@ -10,7 +10,7 @@ use \Tainacan\Repositories; * * Each metadata is a label with the field name and the value. * - * If an ID, a slug or a Tainacan\Entities\Field object is passed, it returns only one metadata, otherwise + * If an ID, a slug or a Tainacan\Entities\Field object is passed in 'metadata' parameter, it returns only one metadata, otherwise * it returns all metadata * * @param array|string $args { diff --git a/tests/test-core-field-types.php b/tests/test-core-field-types.php index 979dfb9db..ef2569a4b 100644 --- a/tests/test-core-field-types.php +++ b/tests/test-core-field-types.php @@ -170,5 +170,46 @@ class CoreFieldTypes extends TAINACAN_UnitTestCase { $this->assertFalse($core_description->validate(), 'Core metadata should not validate because it can not allow it to have multiple'); } + + function test_collection_getters() { + + $Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance(); + + $collection = $this->tainacan_entity_factory->create_entity( + 'collection', + array( + 'name' => 'test', + ), + true + ); + + $fieldDescription = $this->tainacan_entity_factory->create_entity( + 'field', + array( + 'name' => 'just to confuse', + 'description' => 'description', + 'collection' => $collection, + 'field_type' => 'Tainacan\Field_Types\Text' + ), + true + ); + + $core_fields = $collection->get_core_fields(); + + $this->assertEquals(2, sizeof($core_fields)); + + $this->assertNotEquals('Tainacan\Field_Types\Text', $core_fields[0]->get_field_type()); + $this->assertNotEquals('Tainacan\Field_Types\Text', $core_fields[1]->get_field_type()); + + $title = $collection->get_core_title_field(); + + $this->assertEquals('Tainacan\Field_Types\Core_Title', $title->get_field_type()); + + $description = $collection->get_core_description_field(); + + $this->assertEquals('Tainacan\Field_Types\Core_Description', $description->get_field_type()); + + + } } \ No newline at end of file From 7579911b0f2bafd40fc1a6bf79927d65f60837a2 Mon Sep 17 00:00:00 2001 From: Leo Germani Date: Wed, 30 May 2018 16:38:19 -0300 Subject: [PATCH 061/203] small doc improvement --- src/classes/repositories/class-tainacan-fields.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/classes/repositories/class-tainacan-fields.php b/src/classes/repositories/class-tainacan-fields.php index d0857e811..19ce5f56a 100644 --- a/src/classes/repositories/class-tainacan-fields.php +++ b/src/classes/repositories/class-tainacan-fields.php @@ -318,8 +318,8 @@ class Fields extends Repository { } /** - * fetch field by collection, searches all field available - * + * fetch field by collection, considering inheritance + * * @param Entities\Collection $collection * @param array $args WP_Query args plus disabled_fields * @param string $output The desired output format (@see \Tainacan\Repositories\Repository::fetch_output() for possible values) From 52cda3debb96f6e60dfb02a4e04e85eb2352536d Mon Sep 17 00:00:00 2001 From: Leo Germani Date: Wed, 30 May 2018 16:38:45 -0300 Subject: [PATCH 062/203] new template tags --- .../class-tainacan-rest-items-controller.php | 7 +- src/theme-helper/template-tags.php | 64 ++++++++++++++++--- 2 files changed, 61 insertions(+), 10 deletions(-) diff --git a/src/api/endpoints/class-tainacan-rest-items-controller.php b/src/api/endpoints/class-tainacan-rest-items-controller.php index 16c6670cb..8b52e58ea 100644 --- a/src/api/endpoints/class-tainacan-rest-items-controller.php +++ b/src/api/endpoints/class-tainacan-rest-items-controller.php @@ -237,11 +237,14 @@ class REST_Items_Controller extends REST_Controller { ob_start(); - global $wp_query; + global $wp_query, $view_mode_displayed_fields; $wp_query = $items; $displayed_metadata = array_map(function($el) { return (int) $el; }, $request['fetch_only']['meta']); + $view_mode_displayed_fields = $request['fetch_only']; + $view_mode_displayed_fields['meta'] = $displayed_metadata; + include $view_mode['template']; - + $response = ob_get_clean(); } else { diff --git a/src/theme-helper/template-tags.php b/src/theme-helper/template-tags.php index f684b9cc4..86392d5e4 100644 --- a/src/theme-helper/template-tags.php +++ b/src/theme-helper/template-tags.php @@ -42,15 +42,14 @@ use \Tainacan\Repositories; * @return string The HTML output */ function tainacan_get_the_metadata($args = array()) { - $post = get_post(); - $theme_helper = \Tainacan\Theme_Helper::get_instance(); - if (!$theme_helper->is_post_an_item($post)) - return; - - $item = new Entities\Item($post); - - return $item->get_metadata_as_html($args); + $item = tainacan_get_item(); + + if ($item instanceof \Tainacan\Entities\Item) { + return $item->get_metadata_as_html($args); + } + + return ''; } @@ -199,4 +198,53 @@ function tainacan_get_term() { */ function tainacan_register_view_mode($slug, $args = []) { \Tainacan\Theme_Helper::get_instance()->register_view_mode($slug, $args); +} + +/** + * Gets the Tainacan Item Entity object + * + * If used inside the Loop of items, will get the Item object for the current post + */ +function tainacan_get_item($post_id = 0) { + $post = get_post( $post_id ); + + $theme_helper = \Tainacan\Theme_Helper::get_instance(); + + if (!$theme_helper->is_post_an_item($post)) + return null; + + $item = new Entities\Item($post); + + return $item; + +} + +/** + * To be used inside The Loop of a faceted serach view mode template. + * + * Returns true or false indicating wether a certain property or metadata is + * selected to be displayed + * + * @param string|integer The property to be checked. If a string is passed, it will check against + * one of the native property of the item, such as title, description and creation_date. + * If an integer is passed, it will check against the IDs of the metadata. + * + * @return bool + */ +function tainacan_current_view_displays($property) { + global $view_mode_displayed_fields; + + // Core fields appear in fetch_only as metadata + if ($property == 'title' || $property == 'description') { + $item = tainacan_get_item(); + $core_getter_method = "get_core_{$property}_field"; + $property = $item->get_collection()->$core_getter_method()->get_id(); + } + + if (is_string($property)) { + return in_array($property, $view_mode_displayed_fields); + } elseif (is_integer($property)) { + return in_array($property, $view_mode_displayed_fields['meta']); + } + return false; } \ No newline at end of file From 5d342afeff4667507eb1961be708fa82a161ab2b Mon Sep 17 00:00:00 2001 From: Mateus Machado Luna Date: Wed, 30 May 2018 16:50:40 -0300 Subject: [PATCH 063/203] Removes variables from item theme page component. --- src/admin/scss/_buttons.scss | 2 ++ src/admin/theme-items-list.vue | 38 +++++----------------------------- 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/src/admin/scss/_buttons.scss b/src/admin/scss/_buttons.scss index ee0f9e85e..9c85cb82e 100644 --- a/src/admin/scss/_buttons.scss +++ b/src/admin/scss/_buttons.scss @@ -7,6 +7,8 @@ height: inherit !important; box-shadow: none !important; display: inline-flex !important; + cursor: pointer; + background-color: white; &.is-secondary:hover, &.is-secondary:focus { background: $secondary !important; diff --git a/src/admin/theme-items-list.vue b/src/admin/theme-items-list.vue index fb1698fef..6f349ce7b 100644 --- a/src/admin/theme-items-list.vue +++ b/src/admin/theme-items-list.vue @@ -14,7 +14,10 @@ export default { diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue index 07bde8c91..9c40cf2c3 100644 --- a/src/admin/pages/lists/items-page.vue +++ b/src/admin/pages/lists/items-page.vue @@ -241,8 +241,8 @@ - - + @@ -332,7 +332,7 @@ import ItemsList from '../../components/lists/items-list.vue'; import FiltersItemsList from '../../components/search/filters-items-list.vue'; import Pagination from '../../components/search/pagination.vue' - import AdvancedSearch from '../../components/advanced-search/advanced-search.vue'; + // import AdvancedSearch from '../../components/advanced-search/advanced-search.vue'; import { mapActions, mapGetters } from 'vuex'; export default { @@ -396,7 +396,7 @@ ItemsList, FiltersItemsList, Pagination, - AdvancedSearch, + // AdvancedSearch, }, watch: { tableFields() { From 65f13161101dcca931a4df3117147ccc0accee73 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 15:05:22 -0300 Subject: [PATCH 102/203] Update .travis.yml --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7128ce953..c26a803e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,11 +33,12 @@ before_install: - mysql -e 'CREATE DATABASE IF NOT EXISTS test;' install: - echo -e "Install" -- mkdir /tmp/wordpress +- mkdir /tmp/wordpress-tests-lib - mv ./tests/bootstrap-config-sample.php ./tests/bootstrap-config.php +- cat ./tests/bootstrap-config.php #- sed 's/~//home/travis/build/wordpress/g' ./tests/bootstrap-config.php - sudo ./tests/bin/install-wp-tests.sh test root root /tmp/wordpress localhost latest true -- ls /tmp/wordpress +- ls /tmp/wordpress/wor #- service mysql restart script: phpunit #--version #after_success: From 31f6a267f8ea3e374cd3e622e42c7cf9accc65b1 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 15:08:05 -0300 Subject: [PATCH 103/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c26a803e4..b27dce924 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ install: - cat ./tests/bootstrap-config.php #- sed 's/~//home/travis/build/wordpress/g' ./tests/bootstrap-config.php - sudo ./tests/bin/install-wp-tests.sh test root root /tmp/wordpress localhost latest true -- ls /tmp/wordpress/wor +- ls /tmp/wordpress/wordpress-tests-lib #- service mysql restart script: phpunit #--version #after_success: From fee9db084cdca69eb5b0cdf272112a11f844b2bb Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 15:08:29 -0300 Subject: [PATCH 104/203] Update bootstrap-config-sample.php --- tests/bootstrap-config-sample.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bootstrap-config-sample.php b/tests/bootstrap-config-sample.php index 6517be2a0..408a11228 100644 --- a/tests/bootstrap-config-sample.php +++ b/tests/bootstrap-config-sample.php @@ -1,7 +1,7 @@ '/tmp/wordpress/wodpress-tests-lib', + 'tests_dir' => '/tmp/wordpress/wordpress-tests-lib', ]; From aa0f4741acd9683bcf2bad34c717336f94155d6e Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 15:17:16 -0300 Subject: [PATCH 105/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b27dce924..2572db4dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ install: - cat ./tests/bootstrap-config.php #- sed 's/~//home/travis/build/wordpress/g' ./tests/bootstrap-config.php - sudo ./tests/bin/install-wp-tests.sh test root root /tmp/wordpress localhost latest true -- ls /tmp/wordpress/wordpress-tests-lib +- cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php #- service mysql restart script: phpunit #--version #after_success: From a5de06234ea53c52cc223a9e90a7d34aaf442f96 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 15:22:47 -0300 Subject: [PATCH 106/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2572db4dd..e0c43bde8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: # -in deploy_rsa.enc -out deploy_rsa -d #Instalando Mysql - sudo apt-get install sshpass -- sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('root') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;" +- sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('root') where User='root'; update user set plugin='mysql_native_password'; GRANT ALL PRIVILEGES ON * . * TO 'root'@'localhost'; FLUSH PRIVILEGES;" #- sudo mysql_upgrade - sudo service mysql restart - mysql -e 'CREATE DATABASE IF NOT EXISTS test;' From c91ed24dd8b8d0414c602283a687fc1bf03e5a39 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 15:28:34 -0300 Subject: [PATCH 107/203] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e0c43bde8..acc95c869 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,8 @@ before_install: # -in deploy_rsa.enc -out deploy_rsa -d #Instalando Mysql - sudo apt-get install sshpass -- sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('root') where User='root'; update user set plugin='mysql_native_password'; GRANT ALL PRIVILEGES ON * . * TO 'root'@'localhost'; FLUSH PRIVILEGES;" +- mysql -u travis +#- sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('root') where User='root'; update user set plugin='mysql_native_password'; GRANT ALL PRIVILEGES ON * . * TO 'root'@'localhost'; FLUSH PRIVILEGES;" #- sudo mysql_upgrade - sudo service mysql restart - mysql -e 'CREATE DATABASE IF NOT EXISTS test;' From ef56e0523c2c938c1e7c2a6b5c5282a703eeb251 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 15:31:59 -0300 Subject: [PATCH 108/203] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index acc95c869..1443a5c80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,8 +27,8 @@ before_install: # -in deploy_rsa.enc -out deploy_rsa -d #Instalando Mysql - sudo apt-get install sshpass -- mysql -u travis -#- sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('root') where User='root'; update user set plugin='mysql_native_password'; GRANT ALL PRIVILEGES ON * . * TO 'root'@'localhost'; FLUSH PRIVILEGES;" +#- mysql -u travis +- sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('travis') where User='travis'; update user set plugin='mysql_native_password'; FLUSH PRIVILEGES;" #- sudo mysql_upgrade - sudo service mysql restart - mysql -e 'CREATE DATABASE IF NOT EXISTS test;' @@ -38,7 +38,7 @@ install: - mv ./tests/bootstrap-config-sample.php ./tests/bootstrap-config.php - cat ./tests/bootstrap-config.php #- sed 's/~//home/travis/build/wordpress/g' ./tests/bootstrap-config.php -- sudo ./tests/bin/install-wp-tests.sh test root root /tmp/wordpress localhost latest true +- sudo ./tests/bin/install-wp-tests.sh test travis travis /tmp/wordpress localhost latest true - cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php #- service mysql restart script: phpunit #--version From ed2f5cb021dc49088e0ddad758c3ba191131b6f5 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 15:34:10 -0300 Subject: [PATCH 109/203] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1443a5c80..5809456e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ before_install: #Instalando Mysql - sudo apt-get install sshpass #- mysql -u travis -- sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('travis') where User='travis'; update user set plugin='mysql_native_password'; FLUSH PRIVILEGES;" +#- sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('travis') where User='travis'; update user set plugin='mysql_native_password'; FLUSH PRIVILEGES;" #- sudo mysql_upgrade - sudo service mysql restart - mysql -e 'CREATE DATABASE IF NOT EXISTS test;' @@ -38,7 +38,7 @@ install: - mv ./tests/bootstrap-config-sample.php ./tests/bootstrap-config.php - cat ./tests/bootstrap-config.php #- sed 's/~//home/travis/build/wordpress/g' ./tests/bootstrap-config.php -- sudo ./tests/bin/install-wp-tests.sh test travis travis /tmp/wordpress localhost latest true +- sudo ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest true - cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php #- service mysql restart script: phpunit #--version From f79d753588d759d230007783a97dca6894538892 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 15:41:26 -0300 Subject: [PATCH 110/203] Update .travis.yml --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5809456e1..0c720505c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,10 +36,11 @@ install: - echo -e "Install" - mkdir /tmp/wordpress-tests-lib - mv ./tests/bootstrap-config-sample.php ./tests/bootstrap-config.php -- cat ./tests/bootstrap-config.php +#- cat ./tests/bootstrap-config.php #- sed 's/~//home/travis/build/wordpress/g' ./tests/bootstrap-config.php - sudo ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest true -- cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php +- composer install +#- cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php #- service mysql restart script: phpunit #--version #after_success: From 82aac06165db8e5dc2c34bc01d073eecdc96333d Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 15:49:52 -0300 Subject: [PATCH 111/203] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c720505c..188bf1a80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,15 +34,15 @@ before_install: - mysql -e 'CREATE DATABASE IF NOT EXISTS test;' install: - echo -e "Install" -- mkdir /tmp/wordpress-tests-lib -- mv ./tests/bootstrap-config-sample.php ./tests/bootstrap-config.php +#- sudo mkdir /tmp/wordpress-tests-lib +- sudo mv ./tests/bootstrap-config-sample.php ./tests/bootstrap-config.php #- cat ./tests/bootstrap-config.php #- sed 's/~//home/travis/build/wordpress/g' ./tests/bootstrap-config.php - sudo ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest true - composer install #- cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php #- service mysql restart -script: phpunit #--version +script: sudo phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out /tmp/deploy_rsa -d From 3c3f53972e802e19b54492389b119f66f5696b78 Mon Sep 17 00:00:00 2001 From: Jacson Passold Date: Mon, 4 Jun 2018 15:52:42 -0300 Subject: [PATCH 112/203] add dependencies capabilities for cases like when we edit items need to use the crop image feature so we need upload_files capability --- src/classes/class-tainacan-capabilities.php | 58 +++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/src/classes/class-tainacan-capabilities.php b/src/classes/class-tainacan-capabilities.php index 8a50d247c..7fe656ca2 100644 --- a/src/classes/class-tainacan-capabilities.php +++ b/src/classes/class-tainacan-capabilities.php @@ -268,6 +268,16 @@ class Capabilities { ] ], ]; + + public static $dependencies = [ + "tainacan-items" => [ + 'edit_posts' => 'upload_files', + "edit_private_posts" => 'upload_files', + "edit_published_posts" => 'upload_files', + "edit_others_posts" => 'upload_files' + ] + ]; + private static $instance = null; public static function get_instance() @@ -349,6 +359,39 @@ class Capabilities { return $translations; } + protected function check_dependencies($role, $post_type, $cap, $add = true) { + if( + array_key_exists($post_type, self::$dependencies) && + array_key_exists($cap, self::$dependencies[$post_type]) + ) { + $added = false; + if(! $role->has_cap(self::$dependencies[$post_type][$cap]) && $add) { + $role->add_cap(self::$dependencies[$post_type][$cap]); + $added = true; + } + if($role instanceof \WP_User && $add) { //moderator + $append_caps = get_user_meta($role->ID, '.tainacan-dependecies-caps', true); + if(! is_array($append_caps)) $append_caps = []; + if( + (! array_key_exists(self::$dependencies[$post_type][$cap], $append_caps) && $added ) || // we never added and need to add + ( $append_caps[self::$dependencies[$post_type][$cap]] === false && $added ) // we added but before is not need to add + ) { + $append_caps[self::$dependencies[$post_type][$cap]] = 0; + } + else { // we to not added this cap + $append_caps[self::$dependencies[$post_type][$cap]] = false; + } + if($append_caps[self::$dependencies[$post_type][$cap]] !== false) { + $append_caps[self::$dependencies[$post_type][$cap]]++; // add 1 to each collection he is a moderator + update_user_meta($role->ID, '.tainacan-dependecies-caps', $append_caps); + } + } + return self::$dependencies[$post_type][$cap]; + } + return false; + } + + /** * Update post_type caps using WordPress basic roles and register tainacan roles */ @@ -368,6 +411,7 @@ class Capabilities { foreach ($caps as $cap) { $role->add_cap($entity_cap->$cap); + $this->check_dependencies($role, $post_type, $cap); } $tainacan_roles = $this->get_tainacan_roles(); @@ -384,6 +428,7 @@ class Capabilities { foreach ($caps as $cap) { $tainacan_role->add_cap($entity_cap->$cap); + $this->check_dependencies($tainacan_role, $post_type, $cap); } } @@ -414,6 +459,7 @@ class Capabilities { foreach ($caps as $cap) { $role->add_cap($collection_items_caps->$cap); + $this->check_dependencies($role, 'tainacan-items', $cap); } } @@ -464,6 +510,17 @@ class Capabilities { $caps = $defaults_caps['tainacan-items']['editor']; foreach ($caps as $cap) { $user->remove_cap($collection_items_caps->$cap); + $dep_cap = $this->check_dependencies($user, 'tainacan-items', $cap, false); + if($dep_cap !== false) { + $appended_caps = get_user_meta($user->ID, '.tainacan-dependecies-caps', true); + if(array_key_exists($dep_cap, $appended_caps) && $appended_caps[$dep_cap] !== false && $appended_caps[$dep_cap] > 0) { + $appended_caps[$dep_cap]--; + update_user_meta($user->ID, '.tainacan-dependecies-caps', $appended_caps); + if($appended_caps == 0) { // they are not a moderator of a collection, remove cap at all + $user->remove_cap($cap); + } + } + } } } } @@ -487,6 +544,7 @@ class Capabilities { $caps = $defaults_caps['tainacan-items']['editor']; foreach ($caps as $cap) { $user->add_cap($collection_items_caps->$cap); + $this->check_dependencies($user, 'tainacan-items', $cap); } } } From c3fed59437fdbdc560e6f1bcfd45c65760296b4c Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 15:52:44 -0300 Subject: [PATCH 113/203] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 188bf1a80..c7e2ed933 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,9 +40,10 @@ install: #- sed 's/~//home/travis/build/wordpress/g' ./tests/bootstrap-config.php - sudo ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest true - composer install +- ls /tmp/wordpress/wordpress-tests-lib/wp-content #- cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php #- service mysql restart -script: sudo phpunit #--version +script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out /tmp/deploy_rsa -d From 59abfc6fb3a9cd5ef355a88cf65a1cadb09eb47c Mon Sep 17 00:00:00 2001 From: Jacson Passold Date: Mon, 4 Jun 2018 15:53:03 -0300 Subject: [PATCH 114/203] simple dependencies capabilities test --- tests/test-default-capabilities.php | 76 +++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 3 deletions(-) diff --git a/tests/test-default-capabilities.php b/tests/test-default-capabilities.php index cb7ad4ec5..be644eed6 100644 --- a/tests/test-default-capabilities.php +++ b/tests/test-default-capabilities.php @@ -49,10 +49,80 @@ class DefaultCapabilities extends TAINACAN_UnitTestCase { $this->assertTrue(current_user_can($entity_cap->$cap), "tainacan-$role_name does not have capability {$entity_cap->$cap}"); } } - - } } - + } + + /** + * @group capabilities_denpendecies + */ + function test_capabilities_denpendecies() { + + $collection = $this->tainacan_entity_factory->create_entity( + 'collection', + array( + 'name' => 'test capabilities denpendecies', + ), + true + ); + $item = $this->tainacan_entity_factory->create_entity( + 'item', + array( + 'title' => 'test capabilities denpendecies Item', + 'collection' => $collection, + ), + true + ); + + $Tainacan_Capabilities = \Tainacan\Capabilities::get_instance(); + $deps = $Tainacan_Capabilities::$dependencies; + $defaults_caps = $Tainacan_Capabilities->defaults; + $tainacan_roles = $Tainacan_Capabilities->get_tainacan_roles(); + + foreach ($defaults_caps as $post_type => $wp_append_roles) { + if(array_key_exists($post_type, $deps)) { + $entity = false; + $entity_cap = false; + + if($post_type != 'tainacan-items') { + $entity = Repository::get_entity_by_post_type($post_type); + $entity_cap = $entity->get_capabilities(); + } + + foreach ($wp_append_roles as $role_name => $caps) { + $role = get_role($role_name); + + $new_user = $this->factory()->user->create(array( 'role' => $role_name )); + wp_set_current_user($new_user); + + foreach ($caps as $cap) { + if(array_key_exists($cap, $deps[$post_type])) { + $dep_cap = $deps[$post_type][$cap]; + if($post_type == 'tainacan-items') { + $this->assertTrue(current_user_can($dep_cap), "$role_name does not have a dependency capability {$dep_cap} for tainacan-items" ); + } else { + $this->assertTrue(current_user_can($dep_cap), "$role_name does not have a dependency capability {$dep_cap} for {$entity_cap->$cap}" ); + } + } + } + + $new_user = $this->factory()->user->create(array( 'role' => 'tainacan-' . $role_name )); + wp_set_current_user($new_user); + + if(in_array($role_name, $tainacan_roles) ) { + foreach ($caps as $cap) { + if(array_key_exists($cap, $deps[$post_type])) { + $dep_cap = $deps[$post_type][$cap]; + if($post_type == 'tainacan-items') { + $this->assertTrue(current_user_can($dep_cap), "tainaca-$role_name does not have a dependency capability {$dep_cap} for tainacan-items" ); + } else { + $this->assertTrue(current_user_can($dep_cap), "tainaca-$role_name does not have a dependency capability {$dep_cap} for {$entity_cap->$cap}" ); + } + } + } + } + } + } + } } } \ No newline at end of file From 2ce49ce45c7ef022d63f3fb13a3ad2fd7838648e Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 15:55:33 -0300 Subject: [PATCH 115/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c7e2ed933..9f556cf9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ install: - sudo mv ./tests/bootstrap-config-sample.php ./tests/bootstrap-config.php #- cat ./tests/bootstrap-config.php #- sed 's/~//home/travis/build/wordpress/g' ./tests/bootstrap-config.php -- sudo ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest true +- ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest true - composer install - ls /tmp/wordpress/wordpress-tests-lib/wp-content #- cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php From 3581874b7e6e8f1e016f411e4dfc0fac96e8a408 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 15:57:40 -0300 Subject: [PATCH 116/203] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f556cf9b..3ea83d0f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,9 +38,9 @@ install: - sudo mv ./tests/bootstrap-config-sample.php ./tests/bootstrap-config.php #- cat ./tests/bootstrap-config.php #- sed 's/~//home/travis/build/wordpress/g' ./tests/bootstrap-config.php -- ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest true +- sudo ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest true - composer install -- ls /tmp/wordpress/wordpress-tests-lib/wp-content +- sudo ls /tmp/wordpress/wordpress-tests-lib/wp-content #- cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php #- service mysql restart script: phpunit #--version From 6444dba487841ebf3a0be3bc52340434b3046e76 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 16:06:14 -0300 Subject: [PATCH 117/203] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ea83d0f0..2ad60ffb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,10 +40,10 @@ install: #- sed 's/~//home/travis/build/wordpress/g' ./tests/bootstrap-config.php - sudo ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest true - composer install -- sudo ls /tmp/wordpress/wordpress-tests-lib/wp-content +- sudo mkdir /tmp/wordpress/wordpress-tests/wp-content/uploads #- cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php #- service mysql restart -script: phpunit #--version +script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out /tmp/deploy_rsa -d From 618c3580ad9b04fc5f8743a2e95fde96296382c9 Mon Sep 17 00:00:00 2001 From: Mateus Machado Luna Date: Mon, 4 Jun 2018 16:06:45 -0300 Subject: [PATCH 118/203] Adds most of new Modals styling from Design team changes. --- .../edition/category-edition-form.vue | 17 +++--- .../edition/collection-edition-form.vue | 2 + .../components/edition/item-edition-form.vue | 17 +++--- .../components/lists/categories-list.vue | 12 +++- .../components/lists/collections-list.vue | 12 +++- src/admin/components/lists/fields-list.vue | 19 +++--- src/admin/components/lists/filters-list.vue | 19 +++--- src/admin/components/lists/items-list.vue | 12 +++- src/admin/components/lists/terms-list.vue | 15 +++-- src/admin/scss/_modals.scss | 60 ++++++++++++++++++- src/admin/scss/_variables.scss | 1 + src/admin/tainacan-admin-i18n.php | 2 + 12 files changed, 143 insertions(+), 45 deletions(-) diff --git a/src/admin/components/edition/category-edition-form.vue b/src/admin/components/edition/category-edition-form.vue index 0c50a64da..e5f973225 100644 --- a/src/admin/components/edition/category-edition-form.vue +++ b/src/admin/components/edition/category-edition-form.vue @@ -195,14 +195,17 @@ if (formNotSaved) { this.$dialog.confirm({ + title: this.$i18n.get('label_warning'), message: this.$i18n.get('info_warning_category_not_saved'), - onConfirm: () => { - next(); - }, - cancelText: this.$i18n.get('cancel'), - confirmText: this.$i18n.get('continue'), - type: 'is-secondary' - }); + onConfirm: () => { + next(); + }, + icon: 'alert-circle', + hasIcon: true, + cancelText: this.$i18n.get('cancel'), + confirmText: this.$i18n.get('continue'), + type: 'is-success' + }); } else { next() } diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue index 30c03068b..9bcc36dce 100644 --- a/src/admin/components/edition/collection-edition-form.vue +++ b/src/admin/components/edition/collection-edition-form.vue @@ -301,6 +301,7 @@ class="control" custom> {{ registeredViewModes[viewMode].label }} @@ -326,6 +327,7 @@ @focus="clearErrors('default_view_mode')"> diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue index 921a2fe3e..aa8b805c1 100644 --- a/src/admin/components/edition/item-edition-form.vue +++ b/src/admin/components/edition/item-edition-form.vue @@ -676,14 +676,17 @@ export default { beforeRouteLeave ( to, from, next ) { if (this.item.status == 'auto-draft') { this.$dialog.confirm({ + title: this.$i18n.get('label_warning'), message: this.$i18n.get('info_warning_item_not_saved'), - onConfirm: () => { - next(); - }, - cancelText: this.$i18n.get('cancel'), - confirmText: this.$i18n.get('continue'), - type: 'is-secondary' - }); + onConfirm: () => { + next(); + }, + icon: 'alert-circle', + hasIcon: true, + cancelText: this.$i18n.get('cancel'), + confirmText: this.$i18n.get('continue'), + type: 'is-success' + }); } else { next() } diff --git a/src/admin/components/lists/categories-list.vue b/src/admin/components/lists/categories-list.vue index 60d4db813..985d10fcb 100644 --- a/src/admin/components/lists/categories-list.vue +++ b/src/admin/components/lists/categories-list.vue @@ -180,6 +180,7 @@ }, deleteOneCategory(categoryId) { this.$dialog.confirm({ + title: this.$i18n.get('label_warning'), message: this.$i18n.get('info_warning_category_delete'), onConfirm: () => { this.deleteCategory(categoryId) @@ -205,11 +206,15 @@ // queue: true // }); }); - } + }, + icon: 'alert-circle', + hasIcon: true, + type: 'is-success' }); }, deleteSelectedCategories() { this.$dialog.confirm({ + title: this.$i18n.get('label_warning'), message: this.$i18n.get('info_warning_selected_categories_delete'), onConfirm: () => { @@ -237,7 +242,10 @@ } } this.allCategoriesOnPageSelected = false; - } + }, + icon: 'alert-circle', + hasIcon: true, + type: 'is-success' }); }, goToCategoryPage(categoryId) { diff --git a/src/admin/components/lists/collections-list.vue b/src/admin/components/lists/collections-list.vue index f4630dcfb..1c70f6143 100644 --- a/src/admin/components/lists/collections-list.vue +++ b/src/admin/components/lists/collections-list.vue @@ -230,6 +230,7 @@ export default { }, deleteOneCollection(collectionId) { this.$dialog.confirm({ + title: this.$i18n.get('label_warning'), message: this.isOnTrash ? this.$i18n.get('info_warning_collection_delete') : this.$i18n.get('info_warning_collection_trash'), onConfirm: () => { this.deleteCollection({ collectionId: collectionId, isPermanently: this.isOnTrash }) @@ -254,11 +255,15 @@ export default { // queue: true // }) }); - } + }, + icon: 'alert-circle', + hasIcon: true, + type: 'is-success' }); }, deleteSelectedCollections() { this.$dialog.confirm({ + title: this.$i18n.get('label_warning'), message: this.isOnTrash ? this.$i18n.get('info_warning_selected_collections_delete') : this.$i18n.get('info_warning_selected_collections_trash'), onConfirm: () => { @@ -286,7 +291,10 @@ export default { } } this.allCollectionsOnPageSelected = false; - } + }, + icon: 'alert-circle', + hasIcon: true, + type: 'is-success' }); }, goToCollectionPage(collectionId) { diff --git a/src/admin/components/lists/fields-list.vue b/src/admin/components/lists/fields-list.vue index dfb25e567..aaed4f7e7 100644 --- a/src/admin/components/lists/fields-list.vue +++ b/src/admin/components/lists/fields-list.vue @@ -195,15 +195,18 @@ export default { } if ((this.openedFieldId != '' && this.openedFieldId != undefined) || hasUnsavedForms ) { this.$dialog.confirm({ + title: this.$i18n.get('label_warning'), message: this.$i18n.get('info_warning_fields_not_saved'), - onConfirm: () => { - this.onEditionCanceled(); - next(); - }, - cancelText: this.$i18n.get('cancel'), - confirmText: this.$i18n.get('continue'), - type: 'is-secondary' - }); + onConfirm: () => { + this.onEditionCanceled(); + next(); + }, + icon: 'alert-circle', + hasIcon: true, + cancelText: this.$i18n.get('cancel'), + confirmText: this.$i18n.get('continue'), + type: 'is-success' + }); } else { next() } diff --git a/src/admin/components/lists/filters-list.vue b/src/admin/components/lists/filters-list.vue index b2f184081..a05dc6e11 100644 --- a/src/admin/components/lists/filters-list.vue +++ b/src/admin/components/lists/filters-list.vue @@ -222,15 +222,18 @@ export default { } if ((this.openedFilterId != '' && this.openedFilterId != undefined) || hasUnsavedForms ) { this.$dialog.confirm({ + title: this.$i18n.get('label_warning'), message: this.$i18n.get('info_warning_filters_not_saved'), - onConfirm: () => { - this.onEditionCanceled(); - next(); - }, - cancelText: this.$i18n.get('cancel'), - confirmText: this.$i18n.get('continue'), - type: 'is-secondary' - }); + onConfirm: () => { + this.onEditionCanceled(); + next(); + }, + icon: 'alert-circle', + hasIcon: true, + cancelText: this.$i18n.get('cancel'), + confirmText: this.$i18n.get('continue'), + type: 'is-success' + }); } else { next() } diff --git a/src/admin/components/lists/items-list.vue b/src/admin/components/lists/items-list.vue index 35f1153cd..0d887c83a 100644 --- a/src/admin/components/lists/items-list.vue +++ b/src/admin/components/lists/items-list.vue @@ -214,6 +214,7 @@ export default { }, deleteOneItem(itemId) { this.$dialog.confirm({ + title: this.$i18n.get('label_warning'), message: this.isOnTrash ? this.$i18n.get('info_warning_item_delete') : this.$i18n.get('info_warning_item_trash'), onConfirm: () => { this.deleteItem({ itemId: itemId, isPermanently: this.isOnTrash }) @@ -239,11 +240,15 @@ export default { // queue: true // }) }); - } + }, + icon: 'alert-circle', + hasIcon: true, + type: 'is-success' }); }, deleteSelectedItems() { this.$dialog.confirm({ + title: this.$i18n.get('label_warning'), message: this.isOnTrash ? this.$i18n.get('info_warning_selected_items_delete') : this.$i18n.get('info_warning_selected_items_trash'), onConfirm: () => { @@ -275,7 +280,10 @@ export default { } } this.allItemsOnPageSelected = false; - } + }, + icon: 'alert-circle', + hasIcon: true, + type: 'is-success' }); }, goToItemPage(item) { diff --git a/src/admin/components/lists/terms-list.vue b/src/admin/components/lists/terms-list.vue index 918ff369a..9a0586306 100644 --- a/src/admin/components/lists/terms-list.vue +++ b/src/admin/components/lists/terms-list.vue @@ -213,13 +213,16 @@ export default { // Checks if user is deleting a term with unsaved info. if (term.id == 'new' || !term.saved || term.opened) { this.$dialog.confirm({ + title: this.$i18n.get('label_warning'), message: this.$i18n.get('info_warning_terms_not_saved'), - onCancel: () => { return }, - onConfirm: () => { this.removeTerm(term);}, - cancelText: this.$i18n.get('cancel'), - confirmText: this.$i18n.get('continue'), - type: 'is-secondary' - }); + onCancel: () => { return }, + onConfirm: () => { this.removeTerm(term); }, + icon: 'alert-circle', + hasIcon: true, + cancelText: this.$i18n.get('cancel'), + confirmText: this.$i18n.get('continue'), + type: 'is-success' + }); } else{ this.removeTerm(term); } diff --git a/src/admin/scss/_modals.scss b/src/admin/scss/_modals.scss index 637c2ad51..2e517cd91 100644 --- a/src/admin/scss/_modals.scss +++ b/src/admin/scss/_modals.scss @@ -1,4 +1,3 @@ - // Tainacan modals .tainacan-modal-title { h1, h2 { @@ -35,9 +34,64 @@ padding: 80px 0em 0.4em 0em !important; } } +// Bulma modals customized for Tainacan +.dialog{ + .modal-background { + background-color: rgba(0, 0, 0, 0.70); + } + .modal-card { + background-color: $modal-backgound-color; + color: $secondary; + border-radius: 10px; -.modal-background { - background-color: rgba(0, 0, 0, 0.70); + .modal-card-head, .modal-card-body, .modal-card-foot { + background-color: $modal-backgound-color; + color: $secondary; + border: none; + } + .modal-card-head { + p { color: $secondary; } + font-weight: normal; + padding: 30px 35px 0px 35px; + } + .modal-card-body { + padding: 16px 35px; + + i { + color: white !important; + &::before { + background-color: $danger; + border-radius: 55px; + display: initial; + } + } + } + .modal-card-foot { + justify-content: space-between; + padding: 0px 35px 30px 35px; + + .button { + border-radius: 6px !important; + font-weight: normal; + padding: 2px 15px !important; + margin-top: 0px !important; + margin-bottom: 0px !important; + height: inherit !important; + box-shadow: none !important; + display: inline-flex !important; + cursor: pointer; + font-size: 13px !important; + } + .button.is-success { + border: none; + } + .button:not(.is-success) { + background-color: white; + color: $tertiary; + border: 1px solid $gray-light; + } + } + } } // WordPress Media Modal customization diff --git a/src/admin/scss/_variables.scss b/src/admin/scss/_variables.scss index 1e46513db..d0848ebce 100644 --- a/src/admin/scss/_variables.scss +++ b/src/admin/scss/_variables.scss @@ -18,6 +18,7 @@ $primary-darker: darken($primary-dark, 5%); $success: #25a189; $success-invert: findColorInvert($success); +$modal-backgound-color: #bfd8dd; $separator-color: #2b98a4; $tainacan-input-color: #1d1d1d; $tainacan-input-background: #e5e5e5; diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php index d784127ae..36f06217f 100644 --- a/src/admin/tainacan-admin-i18n.php +++ b/src/admin/tainacan-admin-i18n.php @@ -197,6 +197,8 @@ return [ 'label_default_view_mode' => __( 'Default view mode', 'tainacan' ), 'label_enabled_view_modes' => __( 'Enabled view modes', 'tainacan' ), 'label_view_modes_available' => __( 'View modes available on theme', 'tainacan' ), + 'label_warning' => __( 'Warning', 'tainacan' ), + 'label_error' => __( 'Erro', 'tainacan' ), // Instructions. More complex sentences to guide user and placeholders 'instruction_delete_selected_collections' => __( 'Delete selected collections', 'tainacan' ), From c9f76395343d3b963827b23badc362aeedd02556 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 16:08:47 -0300 Subject: [PATCH 119/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ad60ffb5..f8c330ceb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ install: #- sed 's/~//home/travis/build/wordpress/g' ./tests/bootstrap-config.php - sudo ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest true - composer install -- sudo mkdir /tmp/wordpress/wordpress-tests/wp-content/uploads +- sudo mkdir /tmp/wordpress/wordpress-test/wp-content/uploads #- cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php #- service mysql restart script: phpunit #--version From da2e7a2b4d55f74701b8b24c45e1c85751d8e1bd Mon Sep 17 00:00:00 2001 From: Jacson Passold Date: Mon, 4 Jun 2018 16:15:19 -0300 Subject: [PATCH 120/203] missing array key check --- src/classes/class-tainacan-capabilities.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/classes/class-tainacan-capabilities.php b/src/classes/class-tainacan-capabilities.php index 7fe656ca2..f9ae0dcd4 100644 --- a/src/classes/class-tainacan-capabilities.php +++ b/src/classes/class-tainacan-capabilities.php @@ -374,7 +374,11 @@ class Capabilities { if(! is_array($append_caps)) $append_caps = []; if( (! array_key_exists(self::$dependencies[$post_type][$cap], $append_caps) && $added ) || // we never added and need to add - ( $append_caps[self::$dependencies[$post_type][$cap]] === false && $added ) // we added but before is not need to add + ( + array_key_exists(self::$dependencies[$post_type][$cap], $append_caps) && + $append_caps[self::$dependencies[$post_type][$cap]] === false && + $added + ) // we added but before is not need to add ) { $append_caps[self::$dependencies[$post_type][$cap]] = 0; } From a08fdf0693e1a51d428e2dd985c69dc59b2ebcad Mon Sep 17 00:00:00 2001 From: Jacson Passold Date: Mon, 4 Jun 2018 16:15:37 -0300 Subject: [PATCH 121/203] missing assert --- tests/test-api-export.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test-api-export.php b/tests/test-api-export.php index 59041e9b1..6a0168779 100644 --- a/tests/test-api-export.php +++ b/tests/test-api-export.php @@ -110,7 +110,8 @@ class TAINACAN_REST_Export_Controller extends TAINACAN_UnitApiTestCase { $response = $this->server->dispatch($request); $this->assertEquals(200, $response->get_status()); $data = $response->get_data(); - print_r($data); + + $this->assertInstanceOf('SimpleXMLElement', @simplexml_load_string($data)); } } From cae6f00a9b50b92a93c9c44edcf4d5ec8e3bfbfd Mon Sep 17 00:00:00 2001 From: walisonjose Date: Mon, 4 Jun 2018 16:22:27 -0300 Subject: [PATCH 122/203] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index f8c330ceb..f10e04cca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,13 @@ sudo: false language: php php: - 7.1 +- 5.6 - hhvm - nightly matrix: allow_failures: - php: 7.1 + - php: 5.6 - php: hhvm - php: nightly fast_finish: true From 6b3e2738571b39595ccdc316c66e296c8f51d61a Mon Sep 17 00:00:00 2001 From: weryques Date: Mon, 4 Jun 2018 16:29:22 -0300 Subject: [PATCH 123/203] Fixes errors in tests and fixes has content in Custom Interval component --- .../endpoints/class-tainacan-rest-filters-controller.php | 2 +- .../filter-types/custom-interval/CustomInterval.vue | 8 ++++---- src/importer/class-tainacan-importer.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/endpoints/class-tainacan-rest-filters-controller.php b/src/api/endpoints/class-tainacan-rest-filters-controller.php index c1e9d168c..7a93f4c13 100644 --- a/src/api/endpoints/class-tainacan-rest-filters-controller.php +++ b/src/api/endpoints/class-tainacan-rest-filters-controller.php @@ -327,7 +327,7 @@ class REST_Filters_Controller extends REST_Controller { $item_arr['enabled'] = $item->get_enabled_for_collection(); } - $item_arr['filter_type_object'] = $item->get_filter_type_object()->_toArray(); + $item_arr['filter_type_object'] = $item->get_filter_type_object() ? $item->get_filter_type_object()->_toArray() : $item->get_filter_type_object(); return $item_arr; } diff --git a/src/classes/filter-types/custom-interval/CustomInterval.vue b/src/classes/filter-types/custom-interval/CustomInterval.vue index 4b08e2ef3..2ebbf6999 100644 --- a/src/classes/filter-types/custom-interval/CustomInterval.vue +++ b/src/classes/filter-types/custom-interval/CustomInterval.vue @@ -4,7 +4,7 @@
get_id().'.txt', 'w' ); fwrite( $file, $tmp['body'] ); fclose( $file ); From 7f56e379e587a5fcb60df64bfa217c601d36bdbd Mon Sep 17 00:00:00 2001 From: weryques Date: Mon, 4 Jun 2018 16:30:32 -0300 Subject: [PATCH 124/203] Initiaded advanced search (issue #22) --- .../advanced-search/advanced-search.vue | 123 ++++++++++++++++++ .../components/navigation/tainacan-header.vue | 13 +- src/admin/js/router.js | 2 +- src/admin/pages/lists/items-page.vue | 17 ++- 4 files changed, 149 insertions(+), 6 deletions(-) create mode 100644 src/admin/components/advanced-search/advanced-search.vue diff --git a/src/admin/components/advanced-search/advanced-search.vue b/src/admin/components/advanced-search/advanced-search.vue new file mode 100644 index 000000000..27afacd4d --- /dev/null +++ b/src/admin/components/advanced-search/advanced-search.vue @@ -0,0 +1,123 @@ + + + + + \ No newline at end of file diff --git a/src/admin/components/navigation/tainacan-header.vue b/src/admin/components/navigation/tainacan-header.vue index 2f6b0abc1..5fa34bcb6 100644 --- a/src/admin/components/navigation/tainacan-header.vue +++ b/src/admin/components/navigation/tainacan-header.vue @@ -20,7 +20,7 @@
@@ -28,7 +28,7 @@
- {{ $i18n.get('advanced_search') }} + {{ $i18n.get('advanced_search') }}

- + {{ $i18n.get('advanced_search') }}

{{ $i18n.get('filters') }}

- + @@ -361,6 +365,10 @@ enabledViewModes: Object // Used only on theme }, computed: { + openAdvancedSearch(){ + console.log('Called here', this.$route.meta); + return this.$route.meta.openAdvancedSearch; + }, items() { return this.getItems(); }, @@ -428,6 +436,11 @@ 'getViewMode', 'getTotalItems' ]), + openAdvancedSearchComponent(){ + console.log('Called here', this.$route.meta); + this.$set(this.$route.meta, 'openAdvancedSearch', !this.$route.meta.openAdvancedSearch); + console.log('Called here', this.$route.meta); + }, updateSearch() { this.$eventBusSearch.setSearchQuery(this.futureSearchQuery); }, From 980ffa7c6409d93b0aae7169f6675ff4c713d78e Mon Sep 17 00:00:00 2001 From: eduardohumberto Date: Mon, 4 Jun 2018 21:41:14 -0300 Subject: [PATCH 125/203] begin script file for import old tainacan --- src/importer/import.php | 90 +++++++++++++++++++++++++++++++++++++++++ tests/test-importer.php | 4 ++ 2 files changed, 94 insertions(+) create mode 100644 src/importer/import.php diff --git a/src/importer/import.php b/src/importer/import.php new file mode 100644 index 000000000..11d819694 --- /dev/null +++ b/src/importer/import.php @@ -0,0 +1,90 @@ +parse_args($argv); + $this->run(); + + } + + /** + * parse args from and set the attributs + * 1 - Old Tainacan url (required) + */ + function parse_args($argv) { + + if (!is_array($argv)) + return; + + + if (isset($argv[1])) { + + if (filter_var($argv[1], FILTER_VALIDATE_URL)) { + $this->url = $argv[1]; + } + + } + + if (isset($argv[2])) { + + if (is_numeric($argv[2])) { + $this->step = $argv[2]; + } else { + $this->run = ''; + } + + } + + } + + /** + * echo message in prompt line + */ + function log($msg) { + + echo $msg . PHP_EOL; + + } + + function run() { + + $start = $partial = microtime(true); + + // Avoid warnings + $_SERVER['SERVER_PROTOCOL'] = "HTTP/1.1"; + $_SERVER['REQUEST_METHOD'] = "GET"; + + define( 'WP_USE_THEMES', false ); + define( 'SHORTINIT', false ); + require( dirname(__FILE__) . '/../../../../wp-blog-header.php' ); + + $old_tainacan = new \Tainacan\Importer\Old_Tainacan(); + $id = $old_tainacan->get_id(); + + $_SESSION['tainacan_importer'][$id]->set_url($url); + $_SESSION['tainacan_importer'][$id]->set_repository(); + + while (!$_SESSION['tainacan_importer'][$id]->is_finished()){ + $_SESSION['tainacan_importer'][$id]->run(); + } + + $scripttime = microtime(true) - $start; + + $this->log("=========================================================="); + $this->log("=========================================================="); + $this->log("=== Fim do script. Tempo de execução {$scripttime}s"); + $this->log("=========================================================="); + $this->log("=========================================================="); + + } +} + +$x = new ScriptTainacanOld($argv); \ No newline at end of file diff --git a/tests/test-importer.php b/tests/test-importer.php index 908d074c1..064c5e66f 100644 --- a/tests/test-importer.php +++ b/tests/test-importer.php @@ -55,6 +55,10 @@ class ImporterTests extends TAINACAN_UnitTestCase { $_SESSION['tainacan_importer'][$id]->run(); } + $Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance(); + $collections = $Tainacan_Collections->fetch([], 'OBJECT'); + $this->assertEquals(3, $collections, 'total collection in this url does not match'); + $this->assertTrue(true); }*/ From 0b0cdf0a4554313274ecc262fe06c89ac9277726 Mon Sep 17 00:00:00 2001 From: Mateus Machado Luna Date: Tue, 5 Jun 2018 09:27:26 -0300 Subject: [PATCH 126/203] Removes console log from header and subheader. Adds empty fecthonlt and fetchonly meta verifiction before loading items to ensure an empty array is passed. --- .../components/navigation/tainacan-header.vue | 2 - src/admin/pages/lists/items-page.vue | 3 -- src/js/store/modules/collection/actions.js | 44 ++++++++++--------- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/admin/components/navigation/tainacan-header.vue b/src/admin/components/navigation/tainacan-header.vue index 5fa34bcb6..cb15d6d0e 100644 --- a/src/admin/components/navigation/tainacan-header.vue +++ b/src/admin/components/navigation/tainacan-header.vue @@ -52,9 +52,7 @@ export default { }, methods: { openAdvancedSearchComponent(){ - console.log('Called here', this.$route.meta); this.$set(this.$route.meta, 'openAdvancedSearch', !this.$route.meta.openAdvancedSearch); - console.log('Called here', this.$route.meta); } }, props: { diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue index 3d2e53997..fba000fa3 100644 --- a/src/admin/pages/lists/items-page.vue +++ b/src/admin/pages/lists/items-page.vue @@ -366,7 +366,6 @@ }, computed: { openAdvancedSearch(){ - console.log('Called here', this.$route.meta); return this.$route.meta.openAdvancedSearch; }, items() { @@ -437,9 +436,7 @@ 'getTotalItems' ]), openAdvancedSearchComponent(){ - console.log('Called here', this.$route.meta); this.$set(this.$route.meta, 'openAdvancedSearch', !this.$route.meta.openAdvancedSearch); - console.log('Called here', this.$route.meta); }, updateSearch() { this.$eventBusSearch.setSearchQuery(this.futureSearchQuery); diff --git a/src/js/store/modules/collection/actions.js b/src/js/store/modules/collection/actions.js index 9d3561511..b92067ce0 100644 --- a/src/js/store/modules/collection/actions.js +++ b/src/js/store/modules/collection/actions.js @@ -13,6 +13,13 @@ export const fetchItems = ({ rootGetters, dispatch, commit }, { collectionId, is if (postQueries.metaquery != undefined && postQueries.metaquery.length > 0) hasFiltered = true; + // Garanttees at least empty fetch_only are passed in case none is found + if (qs.stringify(postQueries.fetch_only) == '') + postQueries.fetch_only = {}; + + if (qs.stringify(postQueries.fetch_only['meta']) == '') + postQueries.fetch_only['meta'] = [0]; + // Differentiates between repository level and collection level queries let endpoint = '/collection/'+collectionId+'/items?' @@ -22,26 +29,23 @@ export const fetchItems = ({ rootGetters, dispatch, commit }, { collectionId, is if (!isOnTheme) endpoint = endpoint + 'context=edit&' - if (qs.stringify(postQueries.fetch_only['meta']) != '') { - axios.tainacan.get(endpoint + qs.stringify(postQueries)) - .then(res => { - - let items = res.data; - let viewModeObject = tainacan_plugin.registered_view_modes[postQueries.view_mode]; - - if (isOnTheme && viewModeObject != undefined && viewModeObject.type == 'template') { - commit('setItemsListTemplate', items ); - resolve({'itemsListTemplate': items, 'total': res.headers['x-wp-total'], hasFiltered: hasFiltered}); - } else { - commit('setItems', items ); - resolve({'items': items, 'total': res.headers['x-wp-total'], hasFiltered: hasFiltered}); - } - dispatch('search/setTotalItems', res.headers['x-wp-total'], { root: true } ); - }) - .catch(error => reject(error)); - } else { - reject("No fecth_only meta was found."); - } + axios.tainacan.get(endpoint + qs.stringify(postQueries)) + .then(res => { + + let items = res.data; + let viewModeObject = tainacan_plugin.registered_view_modes[postQueries.view_mode]; + + if (isOnTheme && viewModeObject != undefined && viewModeObject.type == 'template') { + commit('setItemsListTemplate', items ); + resolve({'itemsListTemplate': items, 'total': res.headers['x-wp-total'], hasFiltered: hasFiltered}); + } else { + commit('setItems', items ); + resolve({'items': items, 'total': res.headers['x-wp-total'], hasFiltered: hasFiltered}); + } + dispatch('search/setTotalItems', res.headers['x-wp-total'], { root: true } ); + }) + .catch(error => reject(error)); + }); } From eb78a8f3b9a84e98331fa62ef3c32165c9c517c1 Mon Sep 17 00:00:00 2001 From: Mateus Machado Luna Date: Tue, 5 Jun 2018 09:57:08 -0300 Subject: [PATCH 127/203] Solves vuex mutation warning after previous commit. --- src/js/store/modules/collection/actions.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/js/store/modules/collection/actions.js b/src/js/store/modules/collection/actions.js index b92067ce0..0a0f6497e 100644 --- a/src/js/store/modules/collection/actions.js +++ b/src/js/store/modules/collection/actions.js @@ -14,11 +14,11 @@ export const fetchItems = ({ rootGetters, dispatch, commit }, { collectionId, is hasFiltered = true; // Garanttees at least empty fetch_only are passed in case none is found - if (qs.stringify(postQueries.fetch_only) == '') - postQueries.fetch_only = {}; - - if (qs.stringify(postQueries.fetch_only['meta']) == '') - postQueries.fetch_only['meta'] = [0]; + if (qs.stringify(postQueries.fetch_only) == '') + dispatch('search/add_fetchonly', {} , { root: true }); + + if (qs.stringify(postQueries.fetch_only['meta']) == '') + dispatch('search/add_fetchonly_meta', 0 , { root: true }); // Differentiates between repository level and collection level queries let endpoint = '/collection/'+collectionId+'/items?' From 0c794846ffaa7a2e15ad0ed4fdb95d78e0c9ed7e Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 10:24:19 -0300 Subject: [PATCH 128/203] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f10e04cca..eba1478f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,6 +79,7 @@ cache: - vendor - composer notifications: + slack: l3pol:wG8WvtgdhXIR6sN4NfSNoela email: on_success: never on_failure: always From 8426e0a1da1b7a24e94bb77e138214408373c1f0 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 10:30:09 -0300 Subject: [PATCH 129/203] Update .travis.yml --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index eba1478f4..a5d1dc2b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,14 +3,14 @@ language: php php: - 7.1 - 5.6 -- hhvm -- nightly +#- hhvm +#- nightly matrix: allow_failures: - php: 7.1 - php: 5.6 - - php: hhvm - - php: nightly + # - php: hhvm + #- php: nightly fast_finish: true addons: - ssh_know_hosts: @@ -80,6 +80,7 @@ cache: - composer notifications: slack: l3pol:wG8WvtgdhXIR6sN4NfSNoela + on_sucess: always email: on_success: never on_failure: always From 1167c216ff2c0000ff791550688e83b987811b17 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 10:34:51 -0300 Subject: [PATCH 130/203] =?UTF-8?q?Notifica=C3=A7=C3=B5es=20=20Slack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a5d1dc2b0..ad57fc6c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,6 +81,7 @@ cache: notifications: slack: l3pol:wG8WvtgdhXIR6sN4NfSNoela on_sucess: always + on_failure: always email: on_success: never on_failure: always From c44e4af950e80c2f7ff26b82c5c1b940b495a021 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 10:39:31 -0300 Subject: [PATCH 131/203] Update .travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ad57fc6c6..adc305453 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,9 @@ cache: - vendor - composer notifications: - slack: l3pol:wG8WvtgdhXIR6sN4NfSNoela + slack: + l3pol:wG8WvtgdhXIR6sN4NfSNoela + enabled: true on_sucess: always on_failure: always email: From 03314a70b07ad972089a11e6c401d010a0383ecd Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 10:41:41 -0300 Subject: [PATCH 132/203] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index adc305453..52e196e64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,8 +79,7 @@ cache: - vendor - composer notifications: - slack: - l3pol:wG8WvtgdhXIR6sN4NfSNoela + slack: l3pol:wG8WvtgdhXIR6sN4NfSNoela enabled: true on_sucess: always on_failure: always From e36bf6be404cf0603f98b4afe9e8500abcf3e3e1 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 10:43:02 -0300 Subject: [PATCH 133/203] Update .travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 52e196e64..a0946d84f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,9 @@ cache: - vendor - composer notifications: - slack: l3pol:wG8WvtgdhXIR6sN4NfSNoela + slack: + l3pol: + secure: wG8WvtgdhXIR6sN4NfSNoela enabled: true on_sucess: always on_failure: always From b890afa01baefaa899d9181cdc5095054fd493f5 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 10:50:39 -0300 Subject: [PATCH 134/203] Update .travis.yml --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a0946d84f..9d613c066 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,9 +80,8 @@ cache: - composer notifications: slack: - l3pol: - secure: wG8WvtgdhXIR6sN4NfSNoela - enabled: true + rooms: + - l3pol:wG8WvtgdhXIR6sN4NfSNoela on_sucess: always on_failure: always email: From 8d7109d4aecfc686b35e8e4359dcfa9402b12264 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 11:01:05 -0300 Subject: [PATCH 135/203] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d613c066..a75423fe0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,8 +82,8 @@ notifications: slack: rooms: - l3pol:wG8WvtgdhXIR6sN4NfSNoela - on_sucess: always - on_failure: always + on_sucess: change + on_failure: change email: on_success: never on_failure: always From 279a4a0f0532d50a4763513e66f9f69cfd18e901 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 11:17:08 -0300 Subject: [PATCH 136/203] Update .travis.yml --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a75423fe0..0b50127c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,8 +82,9 @@ notifications: slack: rooms: - l3pol:wG8WvtgdhXIR6sN4NfSNoela - on_sucess: change - on_failure: change + on_sucess: always + on_failure: always + on_start: never email: on_success: never on_failure: always From 95969866c092f301606d16ad119e2d5100cb1426 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 11:20:45 -0300 Subject: [PATCH 137/203] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0b50127c3..3eb5769cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,9 +43,10 @@ install: - sudo ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest true - composer install - sudo mkdir /tmp/wordpress/wordpress-test/wp-content/uploads +- phpunit #- cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php #- service mysql restart -script: phpunit #--version +#script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out /tmp/deploy_rsa -d From 6759350260b79e074172c634806cb224d1e6a1a5 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 11:30:57 -0300 Subject: [PATCH 138/203] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3eb5769cd..7a8359df0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ php: #- hhvm #- nightly matrix: - allow_failures: - - php: 7.1 - - php: 5.6 + #allow_failures: + #- php: 7.1 + #- php: 5.6 # - php: hhvm #- php: nightly fast_finish: true From 64ba7307cf3b01b4dc8e2f137de81680266087b7 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 11:35:19 -0300 Subject: [PATCH 139/203] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a8359df0..fed8c73e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,9 @@ install: - sudo ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest true - composer install - sudo mkdir /tmp/wordpress/wordpress-test/wp-content/uploads -- phpunit #- cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php #- service mysql restart -#script: phpunit #--version +script: phpunit #--version #after_success: #- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv # -in deploy_rsa.enc -out /tmp/deploy_rsa -d From d131a342602310f0c937cc14d0d269da9a78b23f Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 11:38:28 -0300 Subject: [PATCH 140/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fed8c73e7..950749b49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ php: #- nightly matrix: #allow_failures: - #- php: 7.1 + - php: 7.1 #- php: 5.6 # - php: hhvm #- php: nightly From 1830bc2694a3de16f3f8ad1c447cf9d4869ed73b Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 11:39:28 -0300 Subject: [PATCH 141/203] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 950749b49..6ea45748f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ php: #- hhvm #- nightly matrix: - #allow_failures: - - php: 7.1 + allow_failures: + - php: 7.1 #- php: 5.6 # - php: hhvm #- php: nightly From 2bde4a7a5d215411c102dda90c5cc8b7aeddf0e0 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 11:42:20 -0300 Subject: [PATCH 142/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6ea45748f..5513536e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ php: #- nightly matrix: allow_failures: - - php: 7.1 + # - php: 7.1 #- php: 5.6 # - php: hhvm #- php: nightly From efa2353570ef763737de3803336f8ed6cd47662d Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 13:29:25 -0300 Subject: [PATCH 143/203] =?UTF-8?q?Atualiza=C3=A7=C3=A3o=20token=20Slack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 63 +++++++++++++++-------------------------------------- 1 file changed, 17 insertions(+), 46 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5513536e6..291161d82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,61 +3,33 @@ language: php php: - 7.1 - 5.6 -#- hhvm -#- nightly -matrix: - allow_failures: - # - php: 7.1 - #- php: 5.6 - # - php: hhvm - #- php: nightly +matrix: + allow_failures: fast_finish: true addons: - ssh_know_hosts: - - "$ssh_host" + - "$ssh_host" apt: sources: - - mysql-5.7-trusty - packages: - - sshpass - - mysql-server - - mysql-client + - mysql-5.7-trusty + packages: + - sshpass + - mysql-server + - mysql-client services: - - mysql +- mysql before_install: -#- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv -# -in deploy_rsa.enc -out deploy_rsa -d -#Instalando Mysql - sudo apt-get install sshpass -#- mysql -u travis -#- sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('travis') where User='travis'; update user set plugin='mysql_native_password'; FLUSH PRIVILEGES;" -#- sudo mysql_upgrade - sudo service mysql restart - mysql -e 'CREATE DATABASE IF NOT EXISTS test;' install: - echo -e "Install" -#- sudo mkdir /tmp/wordpress-tests-lib - sudo mv ./tests/bootstrap-config-sample.php ./tests/bootstrap-config.php -#- cat ./tests/bootstrap-config.php -#- sed 's/~//home/travis/build/wordpress/g' ./tests/bootstrap-config.php -- sudo ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest true +- sudo ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest + true - composer install - sudo mkdir /tmp/wordpress/wordpress-test/wp-content/uploads -#- cat /tmp/wordpress/wordpress-tests-lib/wp-tests-config.php -#- service mysql restart -script: phpunit #--version -#after_success: -#- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv - # -in deploy_rsa.enc -out /tmp/deploy_rsa -d -#- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv -# -in deploy_rsa.enc -out deploy_rsa -d -#- echo -e "After success!" -#- eval "$(ssh-agent -s)" -#- chmod 600 /tmp/deploy_rsa -#- ssh-add /tmp/deploy_rsa -#- echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config -#- ssh-add -l -#- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" +script: phpunit before_deploy: - echo "Seção executada antes do deploy!" - openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv @@ -67,21 +39,20 @@ before_deploy: - ssh-add /tmp/deploy_rsa - echo -e "Host $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config - ssh-add -l -#- ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" deploy: - provider: script - script: echo "Faz Deploy!"#ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" + script: echo "Faz Deploy!"#ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" skip_cleanup: true - on: - branch: continuousintegration + on: + branch: continuousintegration cache: directories: - vendor - composer notifications: - slack: + slack: rooms: - - l3pol:wG8WvtgdhXIR6sN4NfSNoela + secure: WjgA4OIad0/Ai+x1TUd7KShXpaJco9E/MfI6DWJFnBUF5JLKOxymTGbR82wspmnEwzXGWn++co1wNJh20pWobaIToL/2OpBd7xo5MHglNobH4cidmSIDPOQM8ItqBneRjayhXtfShRqQDNCk1D3d5KDUacXXeCX+GLdRuwdc/YuG7Zh3y1KrF6l10cwD/5JOJECwwMbqeLOezvzGi8ITL6pqnEEeNTb0Zr+K2Ru91RBOars4TLK3f5CmX4XxA4oQSMsrHKzTO2OZLua5CRwcBwKmtSqr0Z/W+RrXu2TLxvHYJ39t9uwssI3HmGoB/uNcahBTcE0Vk/phi3nfFO8KUGNqp3xLgUsF/xlb+WiIip2xOf9jq+XNGWwIVB2vWqiQppm58h57LgDNTF21XJOtfVPEyf9Em+VSfNgACq47u4kktgqgZ47xNEBZuv1s3as8BcgdQH78hF+qguhhHJH6RgyHt+GYAq2uRLF8z3IM8hfKpb5mA9jD3UfW3pXEtKF9K+XqtNycX8KxJ2ldEJrMguaqW3sUHSLBo+r71OqldHeuwIfyIGIROTym11GWH56rIXxd51nJuVDWMvTg7bwcjN/d61LdfsaOAgqAYSUPlJjjp67GHZP/vson3uPr//NgnAJ/4gtjwReB7IX8oBLhB5s8lU6dnfnsLbY3Rt+THNA= on_sucess: always on_failure: always on_start: never From c08b7bb1c51f2b8f3e3780e7564d786482d2d168 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 13:40:36 -0300 Subject: [PATCH 144/203] =?UTF-8?q?Testa=20Deploy=20com=20execu=C3=A7?= =?UTF-8?q?=C3=A3o=20dos=20testes=20desabilitada.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 291161d82..9f539c82f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ install: true - composer install - sudo mkdir /tmp/wordpress/wordpress-test/wp-content/uploads -script: phpunit +script: echo "Executa testes!" #phpunit before_deploy: - echo "Seção executada antes do deploy!" - openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv @@ -41,7 +41,7 @@ before_deploy: - ssh-add -l deploy: - provider: script - script: echo "Faz Deploy!"#ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" + script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" skip_cleanup: true on: branch: continuousintegration @@ -55,7 +55,6 @@ notifications: secure: WjgA4OIad0/Ai+x1TUd7KShXpaJco9E/MfI6DWJFnBUF5JLKOxymTGbR82wspmnEwzXGWn++co1wNJh20pWobaIToL/2OpBd7xo5MHglNobH4cidmSIDPOQM8ItqBneRjayhXtfShRqQDNCk1D3d5KDUacXXeCX+GLdRuwdc/YuG7Zh3y1KrF6l10cwD/5JOJECwwMbqeLOezvzGi8ITL6pqnEEeNTb0Zr+K2Ru91RBOars4TLK3f5CmX4XxA4oQSMsrHKzTO2OZLua5CRwcBwKmtSqr0Z/W+RrXu2TLxvHYJ39t9uwssI3HmGoB/uNcahBTcE0Vk/phi3nfFO8KUGNqp3xLgUsF/xlb+WiIip2xOf9jq+XNGWwIVB2vWqiQppm58h57LgDNTF21XJOtfVPEyf9Em+VSfNgACq47u4kktgqgZ47xNEBZuv1s3as8BcgdQH78hF+qguhhHJH6RgyHt+GYAq2uRLF8z3IM8hfKpb5mA9jD3UfW3pXEtKF9K+XqtNycX8KxJ2ldEJrMguaqW3sUHSLBo+r71OqldHeuwIfyIGIROTym11GWH56rIXxd51nJuVDWMvTg7bwcjN/d61LdfsaOAgqAYSUPlJjjp67GHZP/vson3uPr//NgnAJ/4gtjwReB7IX8oBLhB5s8lU6dnfnsLbY3Rt+THNA= on_sucess: always on_failure: always - on_start: never email: on_success: never on_failure: always From c7c0a785614e905bc6a484d66920a13ebf3e491a Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 13:43:25 -0300 Subject: [PATCH 145/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9f539c82f..4407d3832 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ before_deploy: - ssh-add -l deploy: - provider: script - script: ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" + script: sudo ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" skip_cleanup: true on: branch: continuousintegration From b7ef47f07977626afa629344f415cb2468889500 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 13:46:28 -0300 Subject: [PATCH 146/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4407d3832..83ca7e764 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ before_deploy: - ssh-add -l deploy: - provider: script - script: sudo ssh $ssh_user@$ssh_host "sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" + script: ssh $ssh_user@$ssh_host " sudo sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" skip_cleanup: true on: branch: continuousintegration From 60e18796fd8776edce490a503c282154643fa5a6 Mon Sep 17 00:00:00 2001 From: Mateus Machado Luna Date: Tue, 5 Jun 2018 14:00:02 -0300 Subject: [PATCH 147/203] Fixes Thumbnail not disabling in custom view modes. --- src/admin/pages/lists/items-page.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue index fba000fa3..4a63fa8f9 100644 --- a/src/admin/pages/lists/items-page.vue +++ b/src/admin/pages/lists/items-page.vue @@ -465,11 +465,15 @@ } } } + let thumbnailField = this.localTableFields.find(field => field.slug == 'thumbnail'); + let creationDateField = this.localTableFields.find(field => field.slug == 'creation_date'); + let authorNameField = this.localTableFields.find(field => field.slug == 'author_name'); + this.$eventBusSearch.addFetchOnly({ - '0': 'thumbnail', + '0': thumbnailField.display ? 'thumbnail' : null, 'meta': fetchOnlyFieldIds, - '1': 'creation_date', - '2': 'author_name' + '1': creationDateField.display ? 'creation_date' : null, + '2': authorNameField.display ? 'author_name': null }); this.$refs.displayedFieldsDropdown.toggle(); }, From b5726a3df1d0e97e4519d945cadd693b19faae0a Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 14:41:30 -0300 Subject: [PATCH 148/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 83ca7e764..613464077 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ before_deploy: - ssh-add -l deploy: - provider: script - script: ssh $ssh_user@$ssh_host " sudo sh /home/l3p/atualiza_git/atualiza_novo_tainacan.sh" + script: ssh $ssh_user@$ssh_host "$script_deploy_tainacan" skip_cleanup: true on: branch: continuousintegration From da85dccd60e79238265d6ddc829b5a11d270785c Mon Sep 17 00:00:00 2001 From: Mateus Machado Luna Date: Tue, 5 Jun 2018 14:45:07 -0300 Subject: [PATCH 149/203] Removes buggy call to field.field_type_options in itemsList. Fixes css for collection search button and actions cell. --- src/admin/components/lists/items-list.vue | 2 - src/admin/pages/lists/items-page.vue | 65 +++++++++++++---------- src/admin/scss/_tables.scss | 4 +- src/admin/theme-items-list.vue | 6 --- 4 files changed, 37 insertions(+), 40 deletions(-) diff --git a/src/admin/components/lists/items-list.vue b/src/admin/components/lists/items-list.vue index 0d887c83a..09bb9b932 100644 --- a/src/admin/components/lists/items-list.vue +++ b/src/admin/components/lists/items-list.vue @@ -84,8 +84,6 @@ v-for="(column, index) in tableFields" v-if="column.display" :label="column.name" - :aria-label="(column.field != 'row_thumbnail' && column.field != 'row_creation' && column.field != 'row_author') - ? column.name + '' + (item.metadata ? item.metadata[column.slug].value_as_string : '') : ''" class="column-default-width" :class="{ 'thumbnail-cell': column.field == 'row_thumbnail', diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue index 4a63fa8f9..17e5ccfcc 100644 --- a/src/admin/pages/lists/items-page.vue +++ b/src/admin/pages/lists/items-page.vue @@ -20,30 +20,23 @@ :is-full-page="false" :active.sync="isLoadingFilters"/> - -
+
+
-
- -

- -

- + class="input is-small" + :placeholder="$i18n.get('instruction_search')" + type="search" + autocomplete="on" + :value="searchQuery" + @input="futureSearchQuery = $event.target.value" + @keyup.enter="updateSearch()"> + + + +
+
{{ $i18n.get('advanced_search') }} @@ -649,12 +642,26 @@ margin-top: 48px; } - #collection-search-button { - border-radius: 0 !important; - padding: 0 8px !important; - border-color: $tainacan-input-background; - &:focus, &:active { - border-color: none !important; + .search-area { + display: flex; + align-items: center; + margin-right: 36px; + + .control { + input { + height: 27px; + font-size: 11px; + color: $gray-light; + width: 160px; + } + .icon { + pointer-events: all; + cursor: pointer; + color: $tertiary; + height: 27px; + font-size: 18px; + } + margin-bottom: 5px; } } diff --git a/src/admin/scss/_tables.scss b/src/admin/scss/_tables.scss index f00fdfaee..eca4e120a 100644 --- a/src/admin/scss/_tables.scss +++ b/src/admin/scss/_tables.scss @@ -172,14 +172,13 @@ width: 80px; .actions-container { - visibility: hidden; display: flex; position: relative; padding: 0; height: 100%; width: 80px; z-index: 9; - background-color: transparent; + background-color: white; float: right; } @@ -206,7 +205,6 @@ } .actions-cell { .actions-container { - visibility: visible; background: $tainacan-input-background !important; } diff --git a/src/admin/theme-items-list.vue b/src/admin/theme-items-list.vue index 149f09cc0..2ff97cfb6 100644 --- a/src/admin/theme-items-list.vue +++ b/src/admin/theme-items-list.vue @@ -96,12 +96,6 @@ export default { line-height: 20px !important; font-size: 14px !important; } - #collection-search-button { - border: 1px solid $secondary !important; - height: 32px !important; - background-color: $secondary; - color: white; - } .input, .textarea { font-size: 14px; border: none; From a30fbec7b507a687f99870db26d4472ba04f8164 Mon Sep 17 00:00:00 2001 From: walisonjose Date: Tue, 5 Jun 2018 14:46:35 -0300 Subject: [PATCH 150/203] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 613464077..60ad69627 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ before_deploy: - ssh-add -l deploy: - provider: script - script: ssh $ssh_user@$ssh_host "$script_deploy_tainacan" + script: ssh $ssh_user@$ssh_host $script_deploy_tainacan skip_cleanup: true on: branch: continuousintegration From f201edb9411c4fcbf5a52bd5df1b1ee53429d9e8 Mon Sep 17 00:00:00 2001 From: Mateus Machado Luna Date: Tue, 5 Jun 2018 17:25:18 -0300 Subject: [PATCH 151/203] Adds Cards view mode to Admin Panel. Still needs details adjustments. --- src/admin/components/lists/items-list.vue | 92 ++++++++++++++++++- src/admin/pages/lists/items-page.vue | 44 ++++++++- .../scss/_dropdown-and-autocomplete.scss | 1 + src/admin/scss/_view-mode-cards.scss | 81 ++++++++++++++++ src/admin/tainacan-admin-i18n.php | 3 + 5 files changed, 215 insertions(+), 6 deletions(-) create mode 100644 src/admin/scss/_view-mode-cards.scss diff --git a/src/admin/components/lists/items-list.vue b/src/admin/components/lists/items-list.vue index 09bb9b932..60b612293 100644 --- a/src/admin/components/lists/items-list.vue +++ b/src/admin/components/lists/items-list.vue @@ -35,7 +35,93 @@
- + + +
+ +
+
+
+ + +
+ +
+ + +

+ +

+ + +
+ + + + + + +
+ + +
+ + + + +
+ +

{{ column.name }}

+

+ +

+
+
+
+
+
+ + +
@@ -180,7 +266,8 @@ export default { tableFields: Array, items: Array, isLoading: false, - isOnTrash: false + isOnTrash: false, + viewMode: 'table' }, mounted() { this.selectedItems = []; @@ -309,6 +396,7 @@ export default { \ No newline at end of file diff --git a/src/admin/components/navigation/tainacan-header.vue b/src/admin/components/navigation/tainacan-header.vue index 5fa34bcb6..ea592eae5 100644 --- a/src/admin/components/navigation/tainacan-header.vue +++ b/src/admin/components/navigation/tainacan-header.vue @@ -20,7 +20,7 @@
@@ -28,7 +28,7 @@
- {{ $i18n.get('advanced_search') }} + {{ $i18n.get('advanced_search') }} - -